exchange

commit bb45ee0e8ec534e391ea5b8cf21bfe4d153a2f58
parent 15c1a877c617fd29ff61e2ebd1f6fac72e54afce
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Tue, 18 Dec 2018 15:46:32 +0100

check-keys CMD: #5284.

Diffstat:
M
src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
 | 
10
+++-------
M
src/exchange-lib/testing_api_cmd_check_keys.c
 | 
12
++----------
M
src/include/taler_testing_lib.h
 | 
4
+---

3 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c b/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
@@ -75,8 +75,7 @@ run (void *cls,
                               SIGUSR1),
     TALER_TESTING_cmd_check_keys ("check-keys-1",
                                   1,
-                                  4,
-                                  is->exchange),
+                                  4),
     /* sleep a bit */
     TALER_TESTING_cmd_sleep ("sleep",
                              10),
@@ -90,9 +89,7 @@ run (void *cls,
                               SIGUSR1),
     TALER_TESTING_cmd_check_keys ("check-keys-2",
                                   2,
-                                  6,
-                                  is->exchange),
-
+                                  6),
     /* sleep a bit */
     TALER_TESTING_cmd_sleep ("sleep",
                              20),
@@ -106,8 +103,7 @@ run (void *cls,
                               SIGUSR1),
     TALER_TESTING_cmd_check_keys ("check-keys-3",
                                   3,
-                                  8,
-                                  is->exchange),
+                                  8),
     TALER_TESTING_cmd_end ()
   };
 
diff --git a/src/exchange-lib/testing_api_cmd_check_keys.c b/src/exchange-lib/testing_api_cmd_check_keys.c
@@ -46,12 +46,6 @@ struct CheckKeysState
    * have.
    */
   unsigned int num_denom_keys;
-
-  /**
-   * Connection to the exchange.
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
 };
 
 
@@ -83,7 +77,7 @@ check_keys_run (void *cls,
 
     /* Means re-download /keys.  */
     GNUNET_break (0 == TALER_EXCHANGE_check_keys_current
-      (cks->exchange, GNUNET_YES).abs_value_us);
+      (is->exchange, GNUNET_YES).abs_value_us);
     return;
   }
   if (is->key_generation > cks->generation)
@@ -146,8 +140,7 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_check_keys
   (const char *label,
    unsigned int generation,
-   unsigned int num_denom_keys,
-   struct TALER_EXCHANGE_Handle *exchange)
+   unsigned int num_denom_keys)
 {
   struct CheckKeysState *cks;
   struct TALER_TESTING_Command cmd;
@@ -155,7 +148,6 @@ TALER_TESTING_cmd_check_keys
   cks = GNUNET_new (struct CheckKeysState);
   cks->generation = generation;
   cks->num_denom_keys = num_denom_keys;
-  cks->exchange = exchange;
   cmd.cls = cks;
   cmd.label = label;
   cmd.run = &check_keys_run;
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
@@ -1414,7 +1414,6 @@ TALER_TESTING_cmd_sleep (const char *label,
  * @param generation how many /keys responses are expected to
  *        have been returned when this CMD will be run.
  * @param num_denom_keys expected number of denomination keys.
- * @param exchange connection handle to the exchange to test.
  *
  * @return the command.
  */
@@ -1422,8 +1421,7 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_check_keys
   (const char *label,
    unsigned int generation,
-   unsigned int num_denom_keys,
-   struct TALER_EXCHANGE_Handle *exchange);
+   unsigned int num_denom_keys);
 
 
 /**