rename fest, make symbols better match new endpoint names

4 files changed, 31 insertions, 31 deletions

diff --git a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
index 6115ceef6..96d0740e1 100644
--- a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
+++ b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
@@ -227,8 +227,8 @@ deposit_confirmation_run (void *cls,
                                                        &exchange_sig));
   keys = TALER_EXCHANGE_get_keys (dcs->is->exchange);
   GNUNET_assert (NULL != keys);
-  spk = TALER_EXCHANGE_get_exchange_signing_key_info (keys,
-                                                      exchange_pub);
+  spk = TALER_EXCHANGE_get_signing_key_info (keys,
+                                             exchange_pub);
 
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_contract_terms (deposit_cmd,
diff --git a/src/testing/testing_api_cmd_status.c b/src/testing/testing_api_cmd_status.c
index 690a5b9cd..bb1326456 100644
--- a/src/testing/testing_api_cmd_status.c
+++ b/src/testing/testing_api_cmd_status.c
@@ -41,7 +41,7 @@ struct StatusState
   /**
    * Handle to the "reserve status" operation.
    */
-  struct TALER_EXCHANGE_ReserveStatusHandle *rsh;
+  struct TALER_EXCHANGE_ReservesGetHandle *rsh;
 
   /**
    * Expected reserve balance.
@@ -169,10 +169,10 @@ status_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-  ss->rsh = TALER_EXCHANGE_reserve_status (is->exchange,
-                                           reserve_pubp,
-                                           &reserve_status_cb,
-                                           ss);
+  ss->rsh = TALER_EXCHANGE_reserves_get (is->exchange,
+                                         reserve_pubp,
+                                         &reserve_status_cb,
+                                         ss);
 }
 
 
@@ -195,7 +195,7 @@ status_cleanup (void *cls,
                 "Command %u (%s) did not complete\n",
                 ss->is->ip,
                 cmd->label);
-    TALER_EXCHANGE_reserve_status_cancel (ss->rsh);
+    TALER_EXCHANGE_reserves_get_cancel (ss->rsh);
     ss->rsh = NULL;
   }
   GNUNET_free (ss);
diff --git a/src/testing/testing_api_cmd_track.c b/src/testing/testing_api_cmd_track.c
index 2b7263cda..6ebef6933 100644
--- a/src/testing/testing_api_cmd_track.c
+++ b/src/testing/testing_api_cmd_track.c
@@ -64,7 +64,7 @@ struct TrackTransactionState
   /**
    * Handle to the "track transaction" pending operation.
    */
-  struct TALER_EXCHANGE_TrackTransactionHandle *tth;
+  struct TALER_EXCHANGE_DepositGetHandle *tth;
 
   /**
    * Interpreter state.
@@ -124,7 +124,7 @@ struct TrackTransferState
   /**
    * Handle to a pending "track transfer" operation.
    */
-  struct TALER_EXCHANGE_TrackTransferHandle *tth;
+  struct TALER_EXCHANGE_TransfersGetHandle *tth;
 
   /**
    * Interpreter state.
@@ -327,13 +327,13 @@ track_transaction_run (void *cls,
     return;
   }
 
-  tts->tth = TALER_EXCHANGE_track_transaction (is->exchange,
-                                               merchant_priv,
-                                               &h_wire_details,
-                                               &h_contract_terms,
-                                               &coin_pub,
-                                               &deposit_wtid_cb,
-                                               tts);
+  tts->tth = TALER_EXCHANGE_deposits_get (is->exchange,
+                                          merchant_priv,
+                                          &h_wire_details,
+                                          &h_contract_terms,
+                                          &coin_pub,
+                                          &deposit_wtid_cb,
+                                          tts);
   GNUNET_assert (NULL != tts->tth);
 }
 
@@ -357,7 +357,7 @@ track_transaction_cleanup (void *cls,
                 "Command %u (%s) did not complete\n",
                 tts->is->ip,
                 cmd->label);
-    TALER_EXCHANGE_track_transaction_cancel (tts->tth);
+    TALER_EXCHANGE_deposits_get_cancel (tts->tth);
     tts->tth = NULL;
   }
   GNUNET_free (tts);
@@ -453,7 +453,7 @@ track_transfer_cleanup (void *cls,
                 "Command %u (%s) did not complete\n",
                 tts->is->ip,
                 cmd->label);
-    TALER_EXCHANGE_track_transfer_cancel (tts->tth);
+    TALER_EXCHANGE_transfers_get_cancel (tts->tth);
     tts->tth = NULL;
   }
   GNUNET_free (tts);
@@ -709,10 +709,10 @@ track_transfer_run (void *cls,
     }
     GNUNET_assert (NULL != wtid_ptr);
   }
-  tts->tth = TALER_EXCHANGE_track_transfer (is->exchange,
-                                            wtid_ptr,
-                                            &track_transfer_cb,
-                                            tts);
+  tts->tth = TALER_EXCHANGE_transfers_get (is->exchange,
+                                           wtid_ptr,
+                                           &track_transfer_cb,
+                                           tts);
   GNUNET_assert (NULL != tts->tth);
 }
 
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index 207d11876..964121562 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -80,7 +80,7 @@ struct WithdrawState
   /**
    * Withdraw handle (while operation is running).
    */
-  struct TALER_EXCHANGE_ReserveWithdrawHandle *wsh;
+  struct TALER_EXCHANGE_WithdrawHandle *wsh;
 
   /**
    * Task scheduled to try later.
@@ -280,12 +280,12 @@ withdraw_run (void *cls,
      * would free the old one. */
     ws->pk = TALER_EXCHANGE_copy_denomination_key (dpk);
   }
-  ws->wsh = TALER_EXCHANGE_reserve_withdraw (is->exchange,
-                                             ws->pk,
-                                             rp,
-                                             &ws->ps,
-                                             &reserve_withdraw_cb,
-                                             ws);
+  ws->wsh = TALER_EXCHANGE_withdraw (is->exchange,
+                                     ws->pk,
+                                     rp,
+                                     &ws->ps,
+                                     &reserve_withdraw_cb,
+                                     ws);
   if (NULL == ws->wsh)
   {
     GNUNET_break (0);
@@ -313,7 +313,7 @@ withdraw_cleanup (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Command %s did not complete\n",
                 cmd->label);
-    TALER_EXCHANGE_reserve_withdraw_cancel (ws->wsh);
+    TALER_EXCHANGE_withdraw_cancel (ws->wsh);
     ws->wsh = NULL;
   }
   if (NULL != ws->retry_task)