rename /deposit/wtid and /wire/deposits to /track/{transaction,transfer} for improved consistency

3 files changed, 44 insertions, 44 deletions

diff --git a/src/exchange-lib/exchange_api_deposit_wtid.c b/src/exchange-lib/exchange_api_deposit_wtid.c
index 66b91413c..d8dfebdff 100644
--- a/src/exchange-lib/exchange_api_deposit_wtid.c
+++ b/src/exchange-lib/exchange_api_deposit_wtid.c
@@ -16,7 +16,7 @@
 */
 /**
  * @file exchange-lib/exchange_api_deposit_wtid.c
- * @brief Implementation of the /deposit/wtid request of the exchange's HTTP API
+ * @brief Implementation of the /track/transaction request of the exchange's HTTP API
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -36,7 +36,7 @@
 /**
  * @brief A Deposit Wtid Handle
  */
-struct TALER_EXCHANGE_DepositWtidHandle
+struct TALER_EXCHANGE_TrackTransactionHandle
 {
 
   /**
@@ -62,7 +62,7 @@ struct TALER_EXCHANGE_DepositWtidHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_DepositWtidCallback cb;
+  TALER_EXCHANGE_TrackTransactionCallback cb;
 
   /**
    * Closure for @a cb.
@@ -88,7 +88,7 @@ struct TALER_EXCHANGE_DepositWtidHandle
  * @return #GNUNET_OK if the signature is valid, #GNUNET_SYSERR if not
  */
 static int
-verify_deposit_wtid_signature_ok (const struct TALER_EXCHANGE_DepositWtidHandle *dwh,
+verify_deposit_wtid_signature_ok (const struct TALER_EXCHANGE_TrackTransactionHandle *dwh,
                                   const json_t *json,
                                   struct TALER_ExchangePublicKeyP *exchange_pub)
 {
@@ -131,9 +131,9 @@ verify_deposit_wtid_signature_ok (const struct TALER_EXCHANGE_DepositWtidHandle
 
 /**
  * Function called when we're done processing the
- * HTTP /deposit/wtid request.
+ * HTTP /track/transaction request.
  *
- * @param cls the `struct TALER_EXCHANGE_DepositWtidHandle`
+ * @param cls the `struct TALER_EXCHANGE_TrackTransactionHandle`
  * @param response_code HTTP response code, 0 on error
  * @param json parsed JSON result, NULL on error
  */
@@ -142,7 +142,7 @@ handle_deposit_wtid_finished (void *cls,
                               long response_code,
                               const json_t *json)
 {
-  struct TALER_EXCHANGE_DepositWtidHandle *dwh = cls;
+  struct TALER_EXCHANGE_TrackTransactionHandle *dwh = cls;
   const struct TALER_WireTransferIdentifierRawP *wtid = NULL;
   struct GNUNET_TIME_Absolute execution_time = GNUNET_TIME_UNIT_FOREVER_ABS;
   const struct TALER_Amount *coin_contribution = NULL;
@@ -244,7 +244,7 @@ handle_deposit_wtid_finished (void *cls,
            wtid,
            execution_time,
            coin_contribution);
-  TALER_EXCHANGE_deposit_wtid_cancel (dwh);
+  TALER_EXCHANGE_track_transaction_cancel (dwh);
 }
 
 
@@ -261,19 +261,19 @@ handle_deposit_wtid_finished (void *cls,
  * @param cb_cls closure for @a cb
  * @return handle to abort request
  */
-struct TALER_EXCHANGE_DepositWtidHandle *
-TALER_EXCHANGE_deposit_wtid (struct TALER_EXCHANGE_Handle *exchange,
+struct TALER_EXCHANGE_TrackTransactionHandle *
+TALER_EXCHANGE_track_transaction (struct TALER_EXCHANGE_Handle *exchange,
                              const struct TALER_MerchantPrivateKeyP *merchant_priv,
                              const struct GNUNET_HashCode *h_wire,
                              const struct GNUNET_HashCode *h_contract,
                              const struct TALER_CoinSpendPublicKeyP *coin_pub,
                              uint64_t transaction_id,
-                             TALER_EXCHANGE_DepositWtidCallback cb,
+                             TALER_EXCHANGE_TrackTransactionCallback cb,
                              void *cb_cls)
 {
   struct TALER_DepositTrackPS dtp;
   struct TALER_MerchantSignatureP merchant_sig;
-  struct TALER_EXCHANGE_DepositWtidHandle *dwh;
+  struct TALER_EXCHANGE_TrackTransactionHandle *dwh;
   struct GNUNET_CURL_Context *ctx;
   json_t *deposit_wtid_obj;
   CURL *eh;
@@ -284,7 +284,7 @@ TALER_EXCHANGE_deposit_wtid (struct TALER_EXCHANGE_Handle *exchange,
     GNUNET_break (0);
     return NULL;
   }
-  dtp.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_DEPOSIT_WTID);
+  dtp.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION);
   dtp.purpose.size = htonl (sizeof (dtp));
   dtp.h_contract = *h_contract;
   dtp.h_wire = *h_wire;
@@ -307,11 +307,11 @@ TALER_EXCHANGE_deposit_wtid (struct TALER_EXCHANGE_Handle *exchange,
                                 "merchant_pub", GNUNET_JSON_from_data_auto (&dtp.merchant),
                                 "merchant_sig", GNUNET_JSON_from_data_auto (&merchant_sig));
 
-  dwh = GNUNET_new (struct TALER_EXCHANGE_DepositWtidHandle);
+  dwh = GNUNET_new (struct TALER_EXCHANGE_TrackTransactionHandle);
   dwh->exchange = exchange;
   dwh->cb = cb;
   dwh->cb_cls = cb_cls;
-  dwh->url = MAH_path_to_url (exchange, "/deposit/wtid");
+  dwh->url = MAH_path_to_url (exchange, "/track/transaction");
   dwh->depconf.purpose.size = htonl (sizeof (struct TALER_ConfirmWirePS));
   dwh->depconf.purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE);
   dwh->depconf.h_wire = *h_wire;
@@ -353,7 +353,7 @@ TALER_EXCHANGE_deposit_wtid (struct TALER_EXCHANGE_Handle *exchange,
  * @param dwh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_deposit_wtid_cancel (struct TALER_EXCHANGE_DepositWtidHandle *dwh)
+TALER_EXCHANGE_track_transaction_cancel (struct TALER_EXCHANGE_TrackTransactionHandle *dwh)
 {
   if (NULL != dwh->job)
   {
diff --git a/src/exchange-lib/exchange_api_wire_deposits.c b/src/exchange-lib/exchange_api_wire_deposits.c
index 91e2aef7b..68eb9d35e 100644
--- a/src/exchange-lib/exchange_api_wire_deposits.c
+++ b/src/exchange-lib/exchange_api_wire_deposits.c
@@ -16,7 +16,7 @@
 */
 /**
  * @file exchange-lib/exchange_api_wire_deposits.c
- * @brief Implementation of the /wire/deposits request of the exchange's HTTP API
+ * @brief Implementation of the /track/transfer request of the exchange's HTTP API
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -33,9 +33,9 @@
 
 
 /**
- * @brief A /wire/deposits Handle
+ * @brief A /track/transfer Handle
  */
-struct TALER_EXCHANGE_WireDepositsHandle
+struct TALER_EXCHANGE_TrackTransferHandle
 {
 
   /**
@@ -68,9 +68,9 @@ struct TALER_EXCHANGE_WireDepositsHandle
 
 /**
  * Function called when we're done processing the
- * HTTP /wire/deposits request.
+ * HTTP /track/transfer request.
  *
- * @param cls the `struct TALER_EXCHANGE_WireDepositsHandle`
+ * @param cls the `struct TALER_EXCHANGE_TrackTransferHandle`
  * @param response_code HTTP response code, 0 on error
  * @param json parsed JSON result, NULL on error
  */
@@ -79,7 +79,7 @@ handle_wire_deposits_finished (void *cls,
                                long response_code,
                                const json_t *json)
 {
-  struct TALER_EXCHANGE_WireDepositsHandle *wdh = cls;
+  struct TALER_EXCHANGE_TrackTransferHandle *wdh = cls;
 
   wdh->job = NULL;
   switch (response_code)
@@ -116,7 +116,7 @@ handle_wire_deposits_finished (void *cls,
       }
       num_details = json_array_size (details_j);
       {
-        struct TALER_WireDepositDetails details[num_details];
+        struct TALER_TrackTransferDetails details[num_details];
         unsigned int i;
         struct GNUNET_HashContext *hash_context;
         struct TALER_WireDepositDetailP dd;
@@ -125,7 +125,7 @@ handle_wire_deposits_finished (void *cls,
         hash_context = GNUNET_CRYPTO_hash_context_start ();
         for (i=0;i<num_details;i++)
         {
-          struct TALER_WireDepositDetails *detail = &details[i];
+          struct TALER_TrackTransferDetails *detail = &details[i];
           struct json_t *detail_j = json_array_get (details_j, i);
           struct GNUNET_JSON_Specification spec_detail[] = {
             GNUNET_JSON_spec_fixed_auto ("H_contract", &detail->h_contract),
@@ -192,7 +192,7 @@ handle_wire_deposits_finished (void *cls,
                  &total_amount,
                  num_details,
                  details);
-        TALER_EXCHANGE_wire_deposits_cancel (wdh);
+        TALER_EXCHANGE_track_transfer_cancel (wdh);
         return;
       }
     }
@@ -228,7 +228,7 @@ handle_wire_deposits_finished (void *cls,
            NULL,
            json,
            NULL, NULL, 0, NULL);
-  TALER_EXCHANGE_wire_deposits_cancel (wdh);
+  TALER_EXCHANGE_track_transfer_cancel (wdh);
 }
 
 
@@ -242,13 +242,13 @@ handle_wire_deposits_finished (void *cls,
  * @param cb_cls closure for @a cb
  * @return handle to cancel operation
  */
-struct TALER_EXCHANGE_WireDepositsHandle *
-TALER_EXCHANGE_wire_deposits (struct TALER_EXCHANGE_Handle *exchange,
+struct TALER_EXCHANGE_TrackTransferHandle *
+TALER_EXCHANGE_track_transfer (struct TALER_EXCHANGE_Handle *exchange,
                               const struct TALER_WireTransferIdentifierRawP *wtid,
                               TALER_EXCHANGE_WireDepositsCallback cb,
                               void *cb_cls)
 {
-  struct TALER_EXCHANGE_WireDepositsHandle *wdh;
+  struct TALER_EXCHANGE_TrackTransferHandle *wdh;
   struct GNUNET_CURL_Context *ctx;
   char *buf;
   char *path;
@@ -261,7 +261,7 @@ TALER_EXCHANGE_wire_deposits (struct TALER_EXCHANGE_Handle *exchange,
     return NULL;
   }
 
-  wdh = GNUNET_new (struct TALER_EXCHANGE_WireDepositsHandle);
+  wdh = GNUNET_new (struct TALER_EXCHANGE_TrackTransferHandle);
   wdh->exchange = exchange;
   wdh->cb = cb;
   wdh->cb_cls = cb_cls;
@@ -269,7 +269,7 @@ TALER_EXCHANGE_wire_deposits (struct TALER_EXCHANGE_Handle *exchange,
   buf = GNUNET_STRINGS_data_to_string_alloc (wtid,
                                              sizeof (struct TALER_WireTransferIdentifierRawP));
   GNUNET_asprintf (&path,
-                   "/wire/deposits?wtid=%s",
+                   "/track/transfer?wtid=%s",
                    buf);
   wdh->url = MAH_path_to_url (wdh->exchange,
                               path);
@@ -298,7 +298,7 @@ TALER_EXCHANGE_wire_deposits (struct TALER_EXCHANGE_Handle *exchange,
  * @param wdh the wire deposits request handle
  */
 void
-TALER_EXCHANGE_wire_deposits_cancel (struct TALER_EXCHANGE_WireDepositsHandle *wdh)
+TALER_EXCHANGE_track_transfer_cancel (struct TALER_EXCHANGE_TrackTransferHandle *wdh)
 {
   if (NULL != wdh->job)
   {
diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c
index 34e9da83b..acd087039 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -122,12 +122,12 @@ enum OpCode
   OC_WIRE,
 
   /**
-   * Verify exchange's /wire/deposits method.
+   * Verify exchange's /track/transfer method.
    */
   OC_WIRE_DEPOSITS,
 
   /**
-   * Verify exchange's /deposit/wtid method.
+   * Verify exchange's /track/transaction method.
    */
   OC_DEPOSIT_WTID,
 
@@ -514,14 +514,14 @@ struct Command
     } wire;
 
     /**
-     * Information for the /wire/deposits's command.
+     * Information for the /track/transfer's command.
      */
     struct {
 
       /**
        * Handle to the wire deposits request.
        */
-      struct TALER_EXCHANGE_WireDepositsHandle *wdh;
+      struct TALER_EXCHANGE_TrackTransferHandle *wdh;
 
       /**
        * Reference to a command providing a WTID. If set, we use the
@@ -529,7 +529,7 @@ struct Command
        * #OC_DEPOSIT_WTID or an #OC_CHECK_BANK_TRANSFER.  In the
        * case of the bank transfer, we check that the total amount
        * claimed by the exchange matches the total amount transferred
-       * by the bank.  In the case of a /deposit/wtid, we check
+       * by the bank.  In the case of a /track/transaction, we check
        * that the wire details match.
        */
       const char *wtid_ref;
@@ -552,14 +552,14 @@ struct Command
     } wire_deposits;
 
     /**
-     * Information for the /deposit/wtid command.
+     * Information for the /track/transaction command.
      */
     struct {
 
       /**
        * Handle to the deposit wtid request.
        */
-      struct TALER_EXCHANGE_DepositWtidHandle *dwh;
+      struct TALER_EXCHANGE_TrackTransactionHandle *dwh;
 
       /**
        * Which /deposit operation should we obtain WTID data for?
@@ -1409,7 +1409,7 @@ wire_deposits_cb (void *cls,
                   const struct GNUNET_HashCode *h_wire,
                   const struct TALER_Amount *total_amount,
                   unsigned int details_length,
-                  const struct TALER_WireDepositDetails *details)
+                  const struct TALER_TrackTransferDetails *details)
 {
   struct InterpreterState *is = cls;
   struct Command *cmd = &is->commands[is->ip];
@@ -2164,7 +2164,7 @@ interpreter_run (void *cls)
       }
     }
     cmd->details.wire_deposits.wdh
-      = TALER_EXCHANGE_wire_deposits (exchange,
+      = TALER_EXCHANGE_track_transfer (exchange,
                                       &cmd->details.wire_deposits.wtid,
                                       &wire_deposits_cb,
                                       is);
@@ -2202,7 +2202,7 @@ interpreter_run (void *cls)
                        &h_contract);
       json_decref (contract);
       cmd->details.deposit_wtid.dwh
-        = TALER_EXCHANGE_deposit_wtid (exchange,
+        = TALER_EXCHANGE_track_transaction (exchange,
                                        &ref->details.deposit.merchant_priv,
                                        &h_wire,
                                        &h_contract,
@@ -2522,7 +2522,7 @@ do_shutdown (void *cls)
                     "Command %u (%s) did not complete\n",
                     i,
                     cmd->label);
-        TALER_EXCHANGE_wire_deposits_cancel (cmd->details.wire_deposits.wdh);
+        TALER_EXCHANGE_track_transfer_cancel (cmd->details.wire_deposits.wdh);
         cmd->details.wire_deposits.wdh = NULL;
       }
       break;
@@ -2533,7 +2533,7 @@ do_shutdown (void *cls)
                     "Command %u (%s) did not complete\n",
                     i,
                     cmd->label);
-        TALER_EXCHANGE_deposit_wtid_cancel (cmd->details.deposit_wtid.dwh);
+        TALER_EXCHANGE_track_transaction_cancel (cmd->details.deposit_wtid.dwh);
         cmd->details.deposit_wtid.dwh = NULL;
       }
       break;