diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-07-21 15:28:45 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-07-21 15:28:45 +0200 |
| commit | a7eae63d20782b6ecbdb14d5c87ebd39ee65944e (patch) | |
| tree | c3aaf2baa6c59d799906453ad5196902edc787b5 | |
| parent | 7b258d4bdfd8511e75637b5ed623cd1971e7c873 (diff) | |
| download | exchange-a7eae63d20782b6ecbdb14d5c87ebd39ee65944e.tar.gz exchange-a7eae63d20782b6ecbdb14d5c87ebd39ee65944e.tar.bz2 exchange-a7eae63d20782b6ecbdb14d5c87ebd39ee65944e.zip | |
-more multi-account fixes
| -rw-r--r-- | src/auditor/taler-helper-auditor-wire.c | 1 | ||||
| -rw-r--r-- | src/testing/test_exchange_api.c | 10 | ||||
| -rw-r--r-- | src/testing/test_exchange_api.conf | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c index e3753b596..61ffcf65b 100644 --- a/src/auditor/taler-helper-auditor-wire.c +++ b/src/auditor/taler-helper-auditor-wire.c @@ -1613,6 +1613,7 @@ process_debits (void *cls) static void begin_debit_audit (void) { + GNUNET_assert (NULL == out_map); out_map = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES); process_debits (wa_head); diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c index 3cf00fbd4..66cb244a1 100644 --- a/src/testing/test_exchange_api.c +++ b/src/testing/test_exchange_api.c @@ -988,8 +988,9 @@ run (void *cls, cred.user42_payto, cred.exchange_payto, "short-lived-reserve"), - TALER_TESTING_cmd_exec_wirewatch ("short-lived-aggregation", - config_file_expire_reserve_now), + TALER_TESTING_cmd_exec_wirewatch2 ("short-lived-aggregation", + config_file_expire_reserve_now, + "exchange-account-2"), TALER_TESTING_cmd_exec_closer ("close-reserves", config_file_expire_reserve_now, "EUR:5", @@ -1192,8 +1193,9 @@ run (void *cls, = CMD_TRANSFER_TO_EXCHANGE ("reserve-open-close-key", "EUR:20"); reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 1] - = TALER_TESTING_cmd_exec_wirewatch ("reserve-open-close-wirewatch", - config_file_expire_reserve_now); + = TALER_TESTING_cmd_exec_wirewatch2 ("reserve-open-close-wirewatch", + config_file_expire_reserve_now, + "exchange-account-2"); reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 2] = TALER_TESTING_cmd_exec_closer ("reserve-open-close-aggregation", config_file_expire_reserve_now, diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf index 4b0ac2cb6..f24470418 100644 --- a/src/testing/test_exchange_api.conf +++ b/src/testing/test_exchange_api.conf @@ -46,13 +46,13 @@ DURATION = "14 days" [exchange-account-1] -PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42" +PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2" ENABLE_DEBIT = YES ENABLE_CREDIT = YES [exchange-accountcredentials-1] WIRE_GATEWAY_AUTH_METHOD = none -WIRE_GATEWAY_URL = "http://localhost:8082/42/" +WIRE_GATEWAY_URL = "http://localhost:8082/2/" [exchange-account-2] PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2" |