From baf95b86e23184fe785ad4f22c00f83e1d8ea41c Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <stanisci.m@gmail.com>
Date: Tue, 18 Dec 2018 16:36:29 +0100
Subject: [PATCH] /refresh/* & /reserve/status: #5284.

---
 src/exchange-lib/test_exchange_api_new.c     |  5 -----
 src/exchange-lib/test_exchange_api_twisted.c |  2 --
 src/exchange-lib/testing_api_cmd_status.c    | 10 +---------
 src/include/taler_testing_lib.h              |  2 --
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/exchange-lib/test_exchange_api_new.c b/src/exchange-lib/test_exchange_api_new.c
index 8f10a53b4..98076e804 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/src/exchange-lib/test_exchange_api_new.c
@@ -204,7 +204,6 @@ run (void *cls,
      * Check the reserve is depleted.
      */
     TALER_TESTING_cmd_status ("status-1",
-                              is->exchange,
                               "create-reserve-1",
                               "EUR:0",
                               MHD_HTTP_OK),
@@ -702,7 +701,6 @@ run (void *cls,
 
     /* Check the money is back with the reserve */
     TALER_TESTING_cmd_status ("payback-reserve-status-1",
-                              is->exchange,
                               "payback-create-reserve-1",
                               "EUR:5.0",
                               MHD_HTTP_OK),
@@ -726,7 +724,6 @@ run (void *cls,
        MHD_HTTP_FORBIDDEN),
 
     TALER_TESTING_cmd_status ("payback-reserve-status-2",
-                              is->exchange,
                               "payback-create-reserve-1",
                               "EUR:3.99",
                               MHD_HTTP_OK),
@@ -749,7 +746,6 @@ run (void *cls,
        CONFIG_FILE_EXPIRE_RESERVE_NOW),
 
     TALER_TESTING_cmd_status ("short-lived-status",
-                              is->exchange,
                               "short-lived-reserve",
                               "EUR:0",
                               MHD_HTTP_OK),
@@ -921,7 +917,6 @@ run (void *cls,
 
     reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 3]
       = TALER_TESTING_cmd_status ("reserve-open-close-status",
-                                  is->exchange,
                                   "reserve-open-close-key",
                                   "EUR:0",
                                   MHD_HTTP_OK);
diff --git a/src/exchange-lib/test_exchange_api_twisted.c b/src/exchange-lib/test_exchange_api_twisted.c
index cc5377c72..fa850afe6 100644
--- a/src/exchange-lib/test_exchange_api_twisted.c
+++ b/src/exchange-lib/test_exchange_api_twisted.c
@@ -190,7 +190,6 @@ run (void *cls,
      * (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
     TALER_TESTING_cmd_refresh_melt
       ("refresh-melt",
-       is->exchange,
        "EUR:4",
        "refresh-withdraw-coin",
        MHD_HTTP_OK),
@@ -203,7 +202,6 @@ run (void *cls,
 
     TALER_TESTING_cmd_refresh_reveal
       ("refresh-(flipped-)reveal",
-       is->exchange,
        "refresh-melt",
        MHD_HTTP_CONFLICT),
 
diff --git a/src/exchange-lib/testing_api_cmd_status.c b/src/exchange-lib/testing_api_cmd_status.c
index 0c54ab704..f71fe84de 100644
--- a/src/exchange-lib/testing_api_cmd_status.c
+++ b/src/exchange-lib/testing_api_cmd_status.c
@@ -54,11 +54,6 @@ struct StatusState
    */
   unsigned int expected_response_code;
 
-  /**
-   * Connection handle to the exchange.
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
   /**
    * Interpreter state.
    */
@@ -202,7 +197,7 @@ status_run (void *cls,
        sizeof (struct TALER_ReservePublicKeyP));
   }
 
-  ss->rsh = TALER_EXCHANGE_reserve_status (ss->exchange,
+  ss->rsh = TALER_EXCHANGE_reserve_status (is->exchange,
                                            &reserve_pub,
                                            &reserve_status_cb,
                                            ss);
@@ -239,7 +234,6 @@ status_cleanup (void *cls,
  * Create a "reserve status" command.
  *
  * @param label the command label.
- * @param exchange the exchange to connect to.
  * @param reserve_reference reference to the reserve to check.
  * @param expected_balance expected balance for the reserve.
  * @param expected_response_code expected HTTP response code.
@@ -248,7 +242,6 @@ status_cleanup (void *cls,
  */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_status (const char *label,
-                          struct TALER_EXCHANGE_Handle *exchange,
                           const char *reserve_reference,
                           const char *expected_balance,
                           unsigned int expected_response_code)
@@ -257,7 +250,6 @@ TALER_TESTING_cmd_status (const char *label,
   struct StatusState *ss;
 
   ss = GNUNET_new (struct StatusState);
-  ss->exchange = exchange;
   ss->reserve_reference = reserve_reference;
   ss->expected_balance = expected_balance;
   ss->expected_response_code = expected_response_code;
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 1ae663fe4..10bb9b9f5 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -998,7 +998,6 @@ TALER_TESTING_cmd_wire (const char *label,
  * Create a "reserve status" command.
  *
  * @param label the command label.
- * @param exchange the exchange to connect to.
  * @param reserve_reference reference to the reserve to check.
  * @param expected_balance expected balance for the reserve.
  * @param expected_response_code expected HTTP response code.
@@ -1007,7 +1006,6 @@ TALER_TESTING_cmd_wire (const char *label,
  */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_status (const char *label,
-                          struct TALER_EXCHANGE_Handle *exchange,
                           const char *reserve_reference,
                           const char *expected_balance,
                           unsigned int expected_response_code);