[taler-exchange] branch master updated (a57fd6c4 -> 67cf9747)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository exchange.

    from a57fd6c4 fix test case (old one required recoup to *not* be idempotent
     new db4af18a fix ec
     new c032c5fc fix EC codes for merchant
     new 67cf9747 Merge branch 'master' of git+ssh://git.taler.net/exchange

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/include/taler_error_codes.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index 258f5a59..ff3cb7a5 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -1318,28 +1318,28 @@ enum TALER_ErrorCode
    * request.  This response is provided with HTTP status code
    * #MHD_HTTP_SERVICE_UNAVAILABLE.
    */
-  TALER_EC_DEPOSITS_GET_EXCHANGE_TIMEOUT = 2300,
+  TALER_EC_TRACK_TRANSACTION_EXCHANGE_TIMEOUT = 2300,
 
   /**
    * The backend could not find the transaction specified in the
    * request.   This response is provided with HTTP status code
    * #MHD_HTTP_NOT_FOUND.
    */
-  TALER_EC_DEPOSITS_GET_TRANSACTION_UNKNOWN = 2302,
+  TALER_EC_TRACK_TRANSACTION_TRANSACTION_UNKNOWN = 2302,
 
   /**
    * The backend had a database access error trying to retrieve
    * transaction data from its database. The response is provided with
    * HTTP status code #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_DEPOSITS_GET_DB_FETCH_TRANSACTION_ERROR = 2303,
+  TALER_EC_TRACK_TRANSACTION_DB_FETCH_TRANSACTION_ERROR = 2303,
 
   /**
    * The backend had a database access error trying to retrieve payment
    * data from its database. The response is provided with HTTP status
    * code #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_DEPOSITS_GET_DB_FETCH_PAYMENT_ERROR = 2304,
+  TALER_EC_TRACK_TRANSACTION_DB_FETCH_PAYMENT_ERROR = 2304,
 
   /**
    * The backend found no applicable deposits in the database. This is
@@ -1347,7 +1347,7 @@ enum TALER_ErrorCode
    * made for the transaction.  The response is provided with HTTP
    * status code #MHD_HTTP_NOT_FOUND.
    */
-  TALER_EC_DEPOSITS_GET_DB_NO_DEPOSITS_ERROR = 2305,
+  TALER_EC_TRACK_TRANSACTION_DB_NO_DEPOSITS_ERROR = 2305,
 
   /**
    * We failed to obtain a wire transfer identifier for one of the coins
@@ -1356,87 +1356,87 @@ enum TALER_ErrorCode
    * #MHD_HTTP_ACCEPTED if the exchange signaled that the transfer was
    * in progress.
    */
-  TALER_EC_DEPOSITS_GET_COIN_TRACE_ERROR = 2306,
+  TALER_EC_TRACK_TRANSACTION_COIN_TRACE_ERROR = 2306,
 
   /**
    * We failed to obtain the full wire transfer identifier for the
    * transfer one of the coins was aggregated into. The response is
    * provided with HTTP status code #MHD_HTTP_FAILED_DEPENDENCY.
    */
-  TALER_EC_DEPOSITS_GET_WIRE_TRANSFER_TRACE_ERROR = 2307,
+  TALER_EC_TRACK_TRANSACTION_WIRE_TRANSFER_TRACE_ERROR = 2307,
 
   /**
    * We got conflicting reports from the exhange with respect to which
    * transfers are included in which aggregate. The response is provided
    * with HTTP status code #MHD_HTTP_FAILED_DEPENDENCY.
    */
-  TALER_EC_DEPOSITS_GET_CONFLICTING_REPORTS = 2308,
+  TALER_EC_TRACK_TRANSACTION_CONFLICTING_REPORTS = 2308,
 
   /**
    * We failed to contact the exchange for the /track/transfer request.
    * This response is provided with HTTP status code
    * #MHD_HTTP_SERVICE_UNAVAILABLE.
    */
-  TALER_EC_TRANSFERS_GET_EXCHANGE_TIMEOUT = 2400,
+  TALER_EC_TRACK_TRANSFER_EXCHANGE_TIMEOUT = 2400,
 
   /**
    * We failed to persist coin wire transfer information in our merchant
    * database. The response is provided with HTTP status code
    * #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_TRANSFERS_GET_DB_STORE_COIN_ERROR = 2402,
+  TALER_EC_TRACK_TRANSFER_DB_STORE_COIN_ERROR = 2402,
 
   /**
    * We internally failed to execute the /track/transfer request. The
    * response is provided with HTTP status code
    * #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_TRANSFERS_GET_REQUEST_ERROR = 2403,
+  TALER_EC_TRACK_TRANSFER_REQUEST_ERROR = 2403,
 
   /**
    * We failed to persist wire transfer information in our merchant
    * database. The response is provided with HTTP status code
    * #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_TRANSFERS_GET_DB_STORE_TRANSFER_ERROR = 2404,
+  TALER_EC_TRACK_TRANSFER_DB_STORE_TRANSFER_ERROR = 2404,
 
   /**
    * The exchange returned an error from /track/transfer. The response
    * is provided with HTTP status code #MHD_HTTP_FAILED_DEPENDENCY.
    */
-  TALER_EC_TRANSFERS_GET_EXCHANGE_ERROR = 2405,
+  TALER_EC_TRACK_TRANSFER_EXCHANGE_ERROR = 2405,
 
   /**
    * We failed to fetch deposit information from our merchant database.
    * The response is provided with HTTP status code
    * #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_TRANSFERS_GET_DB_FETCH_DEPOSIT_ERROR = 2406,
+  TALER_EC_TRACK_TRANSFER_DB_FETCH_DEPOSIT_ERROR = 2406,
 
   /**
    * We encountered an internal logic error. The response is provided
    * with HTTP status code #MHD_HTTP_INTERNAL_SERVER_ERROR.
    */
-  TALER_EC_TRANSFERS_GET_DB_INTERNAL_LOGIC_ERROR = 2407,
+  TALER_EC_TRACK_TRANSFER_DB_INTERNAL_LOGIC_ERROR = 2407,
 
   /**
    * The exchange gave conflicting information about a coin which has
    * been wire transferred. The response is provided with HTTP status
    * code #MHD_HTTP_FAILED_DEPENDENCY.
    */
-  TALER_EC_TRANSFERS_GET_CONFLICTING_REPORTS = 2408,
+  TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS = 2408,
 
   /**
    * The merchant backend had problems in creating the JSON response.
    */
-  TALER_EC_TRANSFERS_GET_JSON_RESPONSE_ERROR = 2409,
+  TALER_EC_TRACK_TRANSFER_JSON_RESPONSE_ERROR = 2409,
 
   /**
    * The exchange charged a different wire fee than what it originally
    * advertised, and it is higher.  The response is provied with an HTTP
    * status of #MHD_HTTP_FAILED_DEPENDENCY.
    */
-  TALER_EC_TRANSFERS_GET_JSON_BAD_WIRE_FEE = 2410,
+  TALER_EC_TRACK_TRANSFER_JSON_BAD_WIRE_FEE = 2410,
 
   /**
    * The hash provided in the request of /map/in does not match the

-- 
To stop receiving notification emails like this one, please contact
address@hidden.