From 98e44f33a766f049085d7f76d2a11a3ad1d91d57 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 8 Dec 2021 12:42:22 +0100
Subject: add missing preflight

---
 src/exchange/taler-exchange-httpd_keys.c |  2 ++
 src/util/taler-exchange-secmod-rsa.c     | 13 +++++++++++++
 src/util/test_helper_eddsa.conf          |  1 -
 src/util/test_helper_rsa.c               |  2 ++
 src/util/test_helper_rsa.conf            |  2 --
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index f722c16a7..587e0eed9 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -1935,6 +1935,8 @@ build_key_state (struct HelperState *hs,
   ksh->auditors = json_array ();
   GNUNET_assert (NULL != ksh->auditors);
   /* NOTE: fetches master-signed signkeys, but ALSO those that were revoked! */
+  GNUNET_break (GNUNET_OK ==
+                TEH_plugin->preflight (TEH_plugin->cls));
   qs = TEH_plugin->iterate_denominations (TEH_plugin->cls,
                                           &denomination_info_cb,
                                           ksh);
diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index 3b06a56ed..e121e9ab6 100644
--- a/src/util/taler-exchange-secmod-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -868,6 +868,19 @@ update_keys (struct Denomination *denom,
              bool *wake)
 {
   /* create new denomination keys */
+  if (NULL != denom->keys_tail)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Updating keys of denomination `%s', last key %s valid for another %s\n",
+                denom->section,
+                GNUNET_h2s (&denom->keys_tail->h_rsa.hash),
+                GNUNET_STRINGS_relative_time_to_string (
+                  GNUNET_TIME_absolute_get_remaining (
+                    GNUNET_TIME_absolute_subtract (
+                      GNUNET_TIME_absolute_add (
+                        denom->keys_tail->anchor,
+                        denom->duration_withdraw),
+                      overlap_duration)),
+                  GNUNET_YES));
   while ( (NULL == denom->keys_tail) ||
           GNUNET_TIME_absolute_is_past (
             GNUNET_TIME_absolute_subtract (
diff --git a/src/util/test_helper_eddsa.conf b/src/util/test_helper_eddsa.conf
index 8fe119c40..a13833c02 100644
--- a/src/util/test_helper_eddsa.conf
+++ b/src/util/test_helper_eddsa.conf
@@ -1,7 +1,6 @@
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_helper_eddsa_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-/tmp}/${USER}/test_helper_eddsa/
 
 [taler-exchange-secmod-eddsa]
 CLIENT_DIR = $TALER_RUNTIME_DIR
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index 14ff2bfab..bafa45ba8 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -609,6 +609,8 @@ main (int argc,
 
   (void) argc;
   (void) argv;
+  unsetenv ("XDG_DATA_HOME");
+  unsetenv ("XDG_CONFIG_HOME");
   GNUNET_log_setup ("test-helper-rsa",
                     "WARNING",
                     NULL);
diff --git a/src/util/test_helper_rsa.conf b/src/util/test_helper_rsa.conf
index 66127ee01..6f445fc56 100644
--- a/src/util/test_helper_rsa.conf
+++ b/src/util/test_helper_rsa.conf
@@ -1,8 +1,6 @@
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_helper_rsa_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-/tmp}/${USER}/test_helper_rsa/
-
 
 [coin_1]
 DURATION_WITHDRAW = 1 minute
-- 
cgit v1.2.3