exchange rename fest

5 files changed, 47 insertions, 47 deletions

diff --git a/src/backend/taler-merchant-httpd_tip-reserve-helper.c b/src/backend/taler-merchant-httpd_tip-reserve-helper.c
index c9ef0b79..43c10ad7 100644
--- a/src/backend/taler-merchant-httpd_tip-reserve-helper.c
+++ b/src/backend/taler-merchant-httpd_tip-reserve-helper.c
@@ -304,10 +304,10 @@ exchange_cont (void *cls,
     = keys->reserve_closing_delay;
   GNUNET_CRYPTO_eddsa_key_get_public (&ctr->reserve_priv.eddsa_priv,
                                       &reserve_pub.eddsa_pub);
-  ctr->rsh = TALER_EXCHANGE_reserve_status (eh,
-                                            &reserve_pub,
-                                            &handle_status,
-                                            ctr);
+  ctr->rsh = TALER_EXCHANGE_reserves_get (eh,
+                                          &reserve_pub,
+                                          &handle_status,
+                                          ctr);
 }
 
 
@@ -356,7 +356,7 @@ TMH_check_tip_reserve_cleanup (struct CheckTipReserve *ctr)
 {
   if (NULL != ctr->rsh)
   {
-    TALER_EXCHANGE_reserve_status_cancel (ctr->rsh);
+    TALER_EXCHANGE_reserves_get_cancel (ctr->rsh);
     ctr->rsh = NULL;
   }
   if (NULL != ctr->fo)
diff --git a/src/backend/taler-merchant-httpd_tip-reserve-helper.h b/src/backend/taler-merchant-httpd_tip-reserve-helper.h
index c7a763ff..615b9d5b 100644
--- a/src/backend/taler-merchant-httpd_tip-reserve-helper.h
+++ b/src/backend/taler-merchant-httpd_tip-reserve-helper.h
@@ -58,7 +58,7 @@ struct CheckTipReserve
   /**
    * Internal: reserve status operation.
    */
-  struct TALER_EXCHANGE_ReserveStatusHandle *rsh;
+  struct TALER_EXCHANGE_ReservesGetHandle *rsh;
 
   /**
    * Internal: DLL for resumption on shutdown.
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c
index 48bcc070..7f5d747f 100644
--- a/src/backend/taler-merchant-httpd_track-transaction.c
+++ b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -178,7 +178,7 @@ struct TrackCoinContext
   /**
    * Handle for the request to resolve the WTID for this coin.
    */
-  struct TALER_EXCHANGE_TrackTransactionHandle *dwh;
+  struct TALER_EXCHANGE_DepositGetHandle *dwh;
 
   /**
    * Wire transfer identifier for this coin.
@@ -259,7 +259,7 @@ struct TrackTransactionContext
   /**
    * Handle we use to resolve transactions for a given WTID.
    */
-  struct TALER_EXCHANGE_TrackTransferHandle *wdh;
+  struct TALER_EXCHANGE_TransfersGetHandle *wdh;
 
   /**
    * Response to return upon resume.
@@ -342,7 +342,7 @@ free_tctx (struct TrackTransactionContext *tctx)
                                  tcc);
     if (NULL != tcc->dwh)
     {
-      TALER_EXCHANGE_track_transaction_cancel (tcc->dwh);
+      TALER_EXCHANGE_deposits_get_cancel (tcc->dwh);
       tcc->dwh = NULL;
     }
     if (NULL != tcc->exchange_url)
@@ -354,7 +354,7 @@ free_tctx (struct TrackTransactionContext *tctx)
   }
   if (NULL != tctx->wdh)
   {
-    TALER_EXCHANGE_track_transfer_cancel (tctx->wdh);
+    TALER_EXCHANGE_transfers_get_cancel (tctx->wdh);
     tctx->wdh = NULL;
   }
   if (NULL != tctx->fo)
@@ -699,10 +699,10 @@ wtid_cb (void *cls,
     return;
   }
 
-  tctx->wdh = TALER_EXCHANGE_track_transfer (tctx->eh,
-                                             wtid,
-                                             &wire_deposits_cb,
-                                             tctx);
+  tctx->wdh = TALER_EXCHANGE_transfers_get (tctx->eh,
+                                            wtid,
+                                            &wire_deposits_cb,
+                                            tctx);
 }
 
 
@@ -860,13 +860,13 @@ trace_coins (struct TrackTransactionContext *tctx)
     }
     /* we are not done requesting WTIDs from the current
        exchange; do the next one */
-    tcc->dwh = TALER_EXCHANGE_track_transaction (tctx->eh,
-                                                 &tctx->mi->privkey,
-                                                 &tctx->h_wire,
-                                                 &tctx->h_contract_terms,
-                                                 &tcc->coin_pub,
-                                                 &wtid_cb,
-                                                 tcc);
+    tcc->dwh = TALER_EXCHANGE_deposits_get (tctx->eh,
+                                            &tctx->mi->privkey,
+                                            &tctx->h_wire,
+                                            &tctx->h_contract_terms,
+                                            &tcc->coin_pub,
+                                            &wtid_cb,
+                                            tcc);
     return;
   }
   tctx->current_exchange = NULL;
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c b/src/backend/taler-merchant-httpd_track-transfer.c
index f9e9c603..3ce7cc0f 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -60,7 +60,7 @@ struct TrackTransferContext
   /**
    * Handle for the /wire/transfers request.
    */
-  struct TALER_EXCHANGE_TrackTransferHandle *wdh;
+  struct TALER_EXCHANGE_TransfersGetHandle *wdh;
 
   /**
    * For which merchant instance is this tracking request?
@@ -179,7 +179,7 @@ free_transfer_track_context (struct TrackTransferContext *rctx)
   }
   if (NULL != rctx->wdh)
   {
-    TALER_EXCHANGE_track_transfer_cancel (rctx->wdh);
+    TALER_EXCHANGE_transfers_get_cancel (rctx->wdh);
     rctx->wdh = NULL;
   }
   if (NULL != rctx->url)
@@ -470,24 +470,24 @@ check_transfer (void *cls,
     /* Build the `TrackTransferConflictDetails` */
     rctx->response
       = TALER_MHD_make_json_pack (
-      "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
-      "code",
-      (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
-      "hint",
-      "disagreement about deposit valuation",
-      "exchange_deposit_proof", exchange_proof,
-      "conflict_offset",
-      (json_int_t) rctx->current_offset,
-      "exchange_transfer_proof",
-      rctx->original_response,
-      "coin_pub", GNUNET_JSON_from_data_auto (
-        coin_pub),
-      "h_contract_terms",
-      GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
-      "amount_with_fee", TALER_JSON_from_amount (
-        amount_with_fee),
-      "deposit_fee", TALER_JSON_from_amount (
-        deposit_fee));
+          "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
+          "code",
+          (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
+          "hint",
+          "disagreement about deposit valuation",
+          "exchange_deposit_proof", exchange_proof,
+          "conflict_offset",
+          (json_int_t) rctx->current_offset,
+          "exchange_transfer_proof",
+          rctx->original_response,
+          "coin_pub", GNUNET_JSON_from_data_auto (
+            coin_pub),
+          "h_contract_terms",
+          GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
+          "amount_with_fee", TALER_JSON_from_amount (
+            amount_with_fee),
+          "deposit_fee", TALER_JSON_from_amount (
+            deposit_fee));
     return;
   }
   rctx->check_transfer_result = GNUNET_OK;
@@ -828,10 +828,10 @@ process_track_transfer_with_exchange (void *cls,
 
   rctx->fo = NULL;
   rctx->eh = eh;
-  rctx->wdh = TALER_EXCHANGE_track_transfer (eh,
-                                             &rctx->wtid,
-                                             &wire_transfer_cb,
-                                             rctx);
+  rctx->wdh = TALER_EXCHANGE_transfers_get (eh,
+                                            &rctx->wtid,
+                                            &wire_transfer_cb,
+                                            rctx);
   if (NULL == rctx->wdh)
   {
     GNUNET_break (0);
diff --git a/src/lib/testing_api_cmd_tip_pickup.c b/src/lib/testing_api_cmd_tip_pickup.c
index 6d405470..c26b1cfa 100644
--- a/src/lib/testing_api_cmd_tip_pickup.c
+++ b/src/lib/testing_api_cmd_tip_pickup.c
@@ -129,7 +129,7 @@ struct WithdrawHandle
   /**
    * Withdraw operation this handle represents.
    */
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh;
 
   /**
    * Interpreter state.
@@ -286,7 +286,7 @@ pickup_cb (void *cls,
       ( (NULL == wh->wsh) &&
       ( (NULL == tps->sigs) ||
         (NULL == tps->sigs[wh->off].rsa_signature) ) );
-    wh->wsh = TALER_EXCHANGE_reserve_withdraw2
+    wh->wsh = TALER_EXCHANGE_withdraw2
                 (tps->is->exchange,
                 tps->dks[i],
                 &reserve_sigs[i],