Remove 'exchange' handle from pay-abort-refund CMD.

3 files changed, 2 insertions, 14 deletions

diff --git a/src/include/taler_merchant_testing_lib.h b/src/include/taler_merchant_testing_lib.h
index a10363cb..d1755a95 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -192,19 +192,17 @@ TALER_TESTING_cmd_pay_abort (const char *label,
  * at the exchange.
  *
  * @param label command label.
- * @param exchange connection label to the exchange.
  * @param abort_reference reference to the "pay abort" CMD that
  *        will offer the refund permission.
  * @param num_coins how many coins are expected to be refunded.
  * @param refund_amount the amount we are going to redeem as
  *        refund.
- * @param refund_fee the refund fee (FIXME: who pay it?)
+ * @param refund_fee the refund fee (FIXME: who pays it?)
  * @param http_status expected HTTP response code.
  */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_pay_abort_refund
   (const char *label,
-   struct TALER_EXCHANGE_Handle *exchange,
    const char *abort_reference,
    unsigned int num_coins,
    const char *refund_amount,
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index d249a098..52ad28e6 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -968,7 +968,6 @@ run (void *cls,
                                  MHD_HTTP_OK),
 
     TALER_TESTING_cmd_pay_abort_refund ("pay-abort-refund-11",
-                                        is->exchange,
                                         /* abort reference */
                                         "pay-abort-11",
                                         0,
diff --git a/src/lib/testing_api_cmd_pay.c b/src/lib/testing_api_cmd_pay.c
index d28143cc..9d238f72 100644
--- a/src/lib/testing_api_cmd_pay.c
+++ b/src/lib/testing_api_cmd_pay.c
@@ -276,15 +276,9 @@ struct PayAbortRefundState
    * Expected HTTP response code.
    */
   unsigned int http_status;
-
-  /**
-   * Connection handle to the exchange.
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
 };
 
 
-
 /**
  * Free a /check-payment CMD, and possibly cancel a pending
  * operation thereof.
@@ -1519,7 +1513,7 @@ pay_abort_refund_run (void *cls,
     (pars->refund_fee, &refund_fee));
 
   pars->rh = TALER_EXCHANGE_refund2
-    (pars->exchange,
+    (is->exchange,
      &refund_amount,
      &refund_fee,
      h_contract_terms,
@@ -1540,7 +1534,6 @@ pay_abort_refund_run (void *cls,
  * at the exchange.
  *
  * @param label command label.
- * @param exchange connection label to the exchange.
  * @param abort_reference reference to the "pay abort" CMD that
  *        will offer the refund permission.
  * @param num_coins how many coins are expected to be refunded.
@@ -1552,7 +1545,6 @@ pay_abort_refund_run (void *cls,
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_pay_abort_refund
   (const char *label,
-   struct TALER_EXCHANGE_Handle *exchange,
    const char *abort_reference,
    unsigned int num_coins,
    const char *refund_amount,
@@ -1568,7 +1560,6 @@ TALER_TESTING_cmd_pay_abort_refund
   pars->refund_amount = refund_amount;
   pars->refund_fee = refund_fee;
   pars->http_status = http_status;
-  pars->exchange = exchange;
 
   cmd.cls = pars;
   cmd.label = label;