diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-15 12:41:26 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-15 12:41:26 +0100 |
commit | 1ce69e6b2f1b963a473b0787a9f815f6b9ec46e7 (patch) | |
tree | 87058876f28aecd1f2163f66790e42902f7faf11 /src/lib/test_exchange_api_keys_cherry_picking_new.c | |
parent | c8b05da9b1765d17a0503e963c8ba3469d8543cd (diff) | |
download | exchange-1ce69e6b2f1b963a473b0787a9f815f6b9ec46e7.tar.xz |
initialize start_number in fakebank
Diffstat (limited to 'src/lib/test_exchange_api_keys_cherry_picking_new.c')
-rw-r--r-- | src/lib/test_exchange_api_keys_cherry_picking_new.c | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/lib/test_exchange_api_keys_cherry_picking_new.c b/src/lib/test_exchange_api_keys_cherry_picking_new.c index b7cea5a48..45d5b7cb8 100644 --- a/src/lib/test_exchange_api_keys_cherry_picking_new.c +++ b/src/lib/test_exchange_api_keys_cherry_picking_new.c @@ -73,46 +73,37 @@ static void run (void *cls, struct TALER_TESTING_Interpreter *is) { - struct TALER_TESTING_Command keys_serialization[] = { - /** * Serialize keys, and disconnect from the exchange. */ TALER_TESTING_cmd_serialize_keys ("serialize-keys"), - /** * Reconnect to the exchange using the serialized keys. */ TALER_TESTING_cmd_connect_with_state ("reconnect-with-state", "serialize-keys"), - TALER_TESTING_cmd_wire ("verify-/wire-with-serialized-keys", "x-taler-bank", NULL, MHD_HTTP_OK), - TALER_TESTING_cmd_exec_keyup ("keyup-serialization", CONFIG_FILE_EXTENDED_2), - TALER_TESTING_cmd_exec_auditor_sign ("auditor-sign-serialization", CONFIG_FILE_EXTENDED_2), - TALER_TESTING_cmd_sleep ("sleep-serialization", 3), - TALER_TESTING_cmd_signal ("reload-keys-serialization", is->exchanged, SIGUSR1), - TALER_TESTING_cmd_sleep ("sleep-serialization", 3), /** * Why keys number decrease? */ TALER_TESTING_cmd_check_keys ("check-freshest-keys", - 8, + 9, /* generation */ 10), TALER_TESTING_cmd_wire ("verify-/wire-with-fresh-keys", @@ -125,64 +116,49 @@ run (void *cls, }; struct TALER_TESTING_Command ordinary_cherry_pick[] = { - /* Trigger keys reloading from disk. */ TALER_TESTING_cmd_signal ("signal-reaction-1", is->exchanged, SIGUSR1), - TALER_TESTING_cmd_check_keys ("check-keys-1", - 1, + 1, /* generation */ 4), /* sleep a bit */ TALER_TESTING_cmd_sleep ("sleep", 10), - /* 1st keyup happens at start-up */ TALER_TESTING_cmd_exec_keyup ("keyup-2", CONFIG_FILE_EXTENDED), - TALER_TESTING_cmd_exec_auditor_sign ("sign-keys-1", CONFIG_FILE_EXTENDED), - /* Cause exchange to reload (new) keys */ TALER_TESTING_cmd_signal ("trigger-keys-reload-1", is->exchanged, SIGUSR1), - TALER_TESTING_cmd_check_keys ("check-keys-2", - 2, + 2, /* generation */ 6), /* sleep a bit */ TALER_TESTING_cmd_sleep ("sleep", 20), - /* Do 2nd keyup */ TALER_TESTING_cmd_exec_keyup ("keyup-3", CONFIG_FILE_EXTENDED), - TALER_TESTING_cmd_exec_auditor_sign ("sign-keys-2", CONFIG_FILE), - TALER_TESTING_cmd_signal ("trigger-keys-reload-2", is->exchanged, SIGUSR1), - TALER_TESTING_cmd_check_keys ("check-keys-3", - 3, + 3, /* generation */ 8), TALER_TESTING_cmd_end () }; - - struct TALER_TESTING_Command commands[] = { - TALER_TESTING_cmd_batch ("ordinary-cherry-pick", ordinary_cherry_pick), - TALER_TESTING_cmd_batch ("keys-serialization", keys_serialization), - TALER_TESTING_cmd_end () }; |