From dff81f457770c3c6f7d1ad3ffb22362fd005b2d9 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Mar 2020 17:35:18 +0100
Subject: more testing for auditor logic

---
 src/auditor/generate-auditor-basedb.conf    | 14 ++++++++++++--
 src/auditor/taler-helper-auditor-coins.c    |  2 +-
 src/auditor/taler-helper-auditor-reserves.c |  9 ++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index ffaa54712..a9ee5d891 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -95,14 +95,24 @@ HONOR_default = YES
 ACTIVE_default = YES
 
 [fees-x-taler-bank]
-wire-fee-2019 = TESTKUDOS:0.01
-closing-fee-2019 = TESTKUDOS:0.01
 wire-fee-2020 = TESTKUDOS:0.01
 closing-fee-2020 = TESTKUDOS:0.01
 wire-fee-2021 = TESTKUDOS:0.01
 closing-fee-2021 = TESTKUDOS:0.01
 wire-fee-2022 = TESTKUDOS:0.01
 closing-fee-2022 = TESTKUDOS:0.01
+wire-fee-2023 = TESTKUDOS:0.01
+closing-fee-2023 = TESTKUDOS:0.01
+wire-fee-2024 = TESTKUDOS:0.01
+closing-fee-2024 = TESTKUDOS:0.01
+wire-fee-2025 = TESTKUDOS:0.01
+closing-fee-2025 = TESTKUDOS:0.01
+wire-fee-2026 = TESTKUDOS:0.01
+closing-fee-2026 = TESTKUDOS:0.01
+wire-fee-2027 = TESTKUDOS:0.01
+closing-fee-2027 = TESTKUDOS:0.01
+wire-fee-2028 = TESTKUDOS:0.01
+closing-fee-2028 = TESTKUDOS:0.01
 
 [merchant-instance-wireformat-default]
 TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
index ea43b7206..375c901ee 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -2221,7 +2221,7 @@ run (void *cls,
                       /* Tested in test-auditor.sh #4/#5/#6/#13/#26 */
                       "total_bad_sig_loss",
                       TALER_JSON_from_amount (&total_bad_sig_loss),
-                      /* FIXME: Tested in test-auditor.sh #?? */
+                      /* Tested in test-auditor.sh #31 */
                       "row_inconsistencies",
                       report_row_inconsistencies,
                       /* Block #3 */
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
index 79439e01f..8b3925c5a 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -864,9 +864,16 @@ get_closing_fee (const char *receiver_account,
                                    fee,
                                    &master_sig))
   {
+    char *diag;
+
+    GNUNET_asprintf (&diag,
+                     "closing fee for `%s' unavailable at %s\n",
+                     method,
+                     GNUNET_STRINGS_absolute_time_to_string (atime));
     report_row_inconsistency ("closing-fee",
                               atime.abs_value_us,
-                              "closing fee unavailable at given time");
+                              diag);
+    GNUNET_free (diag);
     GNUNET_free (method);
     return GNUNET_SYSERR;
   }
-- 
cgit v1.2.3