diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-03 20:59:37 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-03 20:59:37 +0200 |
commit | c4dc3bf39183559ddcfeafba65ef3d8635bc13fe (patch) | |
tree | 5e3e13f3a38773f1f95e93862410f68189f3ac30 /src/merchant-tools/taler-merchant-benchmark.c | |
parent | 1610f3a16efe10c456f86af65134e1d3765863fd (diff) |
use improved rewind API
Diffstat (limited to 'src/merchant-tools/taler-merchant-benchmark.c')
-rw-r--r-- | src/merchant-tools/taler-merchant-benchmark.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c index ac348998..e4109273 100644 --- a/src/merchant-tools/taler-merchant-benchmark.c +++ b/src/merchant-tools/taler-merchant-benchmark.c @@ -65,13 +65,6 @@ enum PaymentGeneratorError }; -/* Arguments for #TALER_TESTING_cmd_rewind_ip(). FIXME: should probably be - replaced with labels? Bad style! */ -#define FIRST_INSTRUCTION -1 -#define TRACKS_INSTRUCTION 9 -#define TWOCOINS_INSTRUCTION 5 - - /** * What API key should we send in the HTTP 'Authorization' header? */ @@ -280,8 +273,8 @@ run (void *cls, CURRENCY_5, CURRENCY_4_99), TALER_TESTING_cmd_rewind_ip ("rewind-payments", - FIRST_INSTRUCTION, - &payments_number), + "create-reserve", + payments_number), /* Next proposal-pay cycle will be used by /track CMDs * and so it will not have to be looped over, only /track * CMDs will have to. */ @@ -316,8 +309,8 @@ run (void *cls, "post-transaction-1", NULL), TALER_TESTING_cmd_rewind_ip ("rewind-tracks", - TRACKS_INSTRUCTION, - &tracks_number), + "track-transfer-1", + tracks_number), TALER_TESTING_cmd_end () }; @@ -351,8 +344,8 @@ run (void *cls, CURRENCY_5, CURRENCY_4_99), TALER_TESTING_cmd_rewind_ip ("rewind-unaggregated", - FIRST_INSTRUCTION, - &unaggregated_number), + "create-reserve-1", + unaggregated_number), TALER_TESTING_cmd_admin_add_incoming ("create-reserve-2", CURRENCY_10_02, &bc.exchange_auth, @@ -381,8 +374,8 @@ run (void *cls, TALER_TESTING_cmd_exec_aggregator ("aggregate-twocoins", cfg_filename), TALER_TESTING_cmd_rewind_ip ("rewind-twocoins", - TWOCOINS_INSTRUCTION, - &twocoins_number), + "create-reserve-2", + twocoins_number), TALER_TESTING_cmd_end () }; |