diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-12-18 15:46:32 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-12-18 15:46:32 +0100 |
| commit | bb45ee0e8ec534e391ea5b8cf21bfe4d153a2f58 (patch) | |
| tree | d1da6ef97f65ae2a0daf9396938fe665b1fa86a5 | |
| parent | 15c1a877c617fd29ff61e2ebd1f6fac72e54afce (diff) | |
check-keys CMD: #5284.
| -rw-r--r-- | src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c | 10 | ||||
| -rw-r--r-- | src/exchange-lib/testing_api_cmd_check_keys.c | 12 | ||||
| -rw-r--r-- | 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 index 929bb5fb..841ab739 100644 --- 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 index e478ff8b..ede43285 100644 --- 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 index 9c0b00b5..8c2b01f8 100644 --- 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); /** |