one EC for instance unknown

1 files changed, 2 insertions, 53 deletions

diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index b490f2bb0..3a5ef4ae1 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -937,12 +937,13 @@ enum TALER_ErrorCode
    * in the request.   This response is
    * provided with HTTP status code MHD_HTTP_NOT_FOUND.
    */
-  TALER_EC_CONTRACT_INSTANCE_UNKNOWN = 2000,
+  TALER_EC_INSTANCE_UNKNOWN = 2000,
 
   /**
    * The frontend specified two different instances within
    * the same order: one in the top level, and the other one
    * within the 'merchant' object.
+   * FIXME: hopefully this one is now obsolete?
    */
   TALER_EC_CONTRACT_INSTANCE_INCONSISTENT = 2001,
 
@@ -1026,13 +1027,6 @@ enum TALER_ErrorCode
   TALER_EC_PAY_EXCHANGE_TIMEOUT = 2111,
 
   /**
-   * The backend could not find the merchant instance specified
-   * in the request.   This response is
-   * provided with HTTP status code MHD_HTTP_NOT_FOUND.
-   */
-  TALER_EC_PAY_INSTANCE_UNKNOWN = 2112,
-
-  /**
    * The signature over the contract of the merchant
    * was invalid. This response is provided with HTTP status code
    * MHD_HTTP_BAD_REQUEST.
@@ -1149,12 +1143,6 @@ enum TALER_ErrorCode
   TALER_EC_HISTORY_DB_FETCH_ERROR = 2201,
 
   /**
-   * Instance used to retrieve history is unknown to the
-   * merchant.
-   */
-  TALER_EC_HISTORY_INSTANCE_UNKNOWN = 2202,
-
-  /**
    * We failed to contact the exchange for the /track/transaction
    * request.  This response is provided with HTTP status code
    * MHD_HTTP_SERVICE_UNAVAILABLE.
@@ -1162,13 +1150,6 @@ enum TALER_ErrorCode
   TALER_EC_TRACK_TRANSACTION_EXCHANGE_TIMEOUT = 2300,
 
   /**
-   * The backend could not find the merchant instance specified
-   * in the request.   This response is
-   * provided with HTTP status code MHD_HTTP_NOT_FOUND.
-   */
-  TALER_EC_TRACK_TRANSACTION_INSTANCE_UNKNOWN = 2301,
-
-  /**
    * The backend could not find the transaction specified
    * in the request.   This response is
    * provided with HTTP status code MHD_HTTP_NOT_FOUND.
@@ -1234,13 +1215,6 @@ enum TALER_ErrorCode
   TALER_EC_TRACK_TRANSFER_EXCHANGE_TIMEOUT = 2400,
 
   /**
-   * The backend could not find the merchant instance specified
-   * in the request.   This response is
-   * provided with HTTP status code MHD_HTTP_NOT_FOUND.
-   */
-  TALER_EC_TRACK_TRANSFER_INSTANCE_UNKNOWN = 2401,
-
-  /**
    * We failed to persist coin wire transfer information in
    * our merchant database.
    * The response is
@@ -1366,11 +1340,6 @@ enum TALER_ErrorCode
 
 
   /**
-   * The client specified an unknown instance for any of the /refund operations
-   */
-  TALER_EC_REFUND_INSTANCE_UNKNOWN = 2600,
-
-  /**
    * The frontend gave an unknown order id to issue the refund to.
    */
   TALER_EC_REFUND_ORDER_ID_UNKNOWN = 2601,
@@ -1409,13 +1378,6 @@ enum TALER_ErrorCode
 
 
   /**
-   * The backend does not know the instance that was supposed to support
-   * the tip.  Likely to be a configuration error. Returned with an
-   * HTTP status code of "NOT FOUND".
-   */
-  TALER_EC_TIP_AUTHORIZE_INSTANCE_UNKNOWN = 2700,
-
-  /**
    * The backend knows the instance that was supposed to support the
    * tip, but it was not configured for tipping (i.e. has no exchange
    * associated with it).  Likely to be a configuration
@@ -1596,19 +1558,6 @@ enum TALER_ErrorCode
   TALER_EC_TIP_QUERY_TIP_ID_UNKNOWN = 2810,
 
   /**
-   * The backend could not find the merchant instance specified
-   * in the request.   This response is
-   * provided with HTTP status code MHD_HTTP_NOT_FOUND.
-   */
-  TALER_EC_TIP_INSTANCE_UNKNOWN = 2811,
-
-  /**
-   * The instance for check-payment is unknown, likely
-   * a buggy frontend or misconfigured instances.
-   */
-  TALER_EC_CHECK_PAYMENT_INSTANCE_UNKNOWN = 2910,
-
-  /**
    * We failed to contract terms from our merchant database.
    * The response is provided with HTTP status code
    * MHD_HTTP_INTERNAL_SERVER_ERROR.