From 2285f5c5216d9c1684c35008cfb4fee68d6e9c7d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 21 Jul 2023 15:51:39 +0200 Subject: -fix wire auditor for multiple accounts --- src/auditor/taler-helper-auditor-wire.c | 6 ++++-- src/testing/test_auditor_api.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c index 61ffcf65b..4e4d0ae22 100644 --- a/src/auditor/taler-helper-auditor-wire.c +++ b/src/auditor/taler-helper-auditor-wire.c @@ -1436,6 +1436,7 @@ check_exchange_wire_out (struct WireAccount *wa) { enum GNUNET_DB_QueryStatus qs; + GNUNET_assert (NULL == wa->dhh); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Analyzing exchange's wire OUT table for account `%s'\n", wa->ai->section_name); @@ -1615,7 +1616,7 @@ begin_debit_audit (void) { GNUNET_assert (NULL == out_map); out_map = GNUNET_CONTAINER_multihashmap_create (1024, - GNUNET_YES); + true); process_debits (wa_head); } @@ -1989,7 +1990,7 @@ history_credit_cb (void *cls, if (! analyze_credit (wa, cd)) - break; + return; } conclude_account (wa); return; @@ -2089,6 +2090,7 @@ process_credits (void *cls) static void begin_credit_audit (void) { + GNUNET_assert (NULL == in_map); in_map = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_YES); /* now go over all bank accounts and check delta with in_map */ diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c index 592cc0163..a9c53d399 100644 --- a/src/testing/test_auditor_api.c +++ b/src/testing/test_auditor_api.c @@ -426,8 +426,9 @@ run (void *cls, */ CMD_TRANSFER_TO_EXCHANGE ("short-lived-reserve", "EUR:5.01"), - 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_aggregator ("close-reserves", config_file_expire_reserve_now), /** -- cgit v1.2.3