From 9cbd1cc139217cc33ac1943d165e9b89ca5a8668 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 7 Dec 2019 17:20:09 +0100
Subject: report on file used

---
 src/exchange-tools/taler-exchange-wire.c |  5 +++--
 src/lib/test_exchange_api.conf           |  9 +++++++++
 src/lib/testing_api_helpers.c            | 11 +++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/exchange-tools/taler-exchange-wire.c b/src/exchange-tools/taler-exchange-wire.c
index ae8a4a740..e39e3c829 100644
--- a/src/exchange-tools/taler-exchange-wire.c
+++ b/src/exchange-tools/taler-exchange-wire.c
@@ -198,8 +198,9 @@ run (void *cls,
                           &mpub_cfg))
   {
     fprintf (stderr,
-             "Master public key `%s' in configuration does not match our master private key!\n",
-             masters);
+             "Master public key `%s' in configuration does not match our master private key from `%s'!\n",
+             masters,
+             masterkeyfile);
     GNUNET_free (masters);
     global_ret = 1;
     return;
diff --git a/src/lib/test_exchange_api.conf b/src/lib/test_exchange_api.conf
index c2159dcd6..c7adcfe06 100644
--- a/src/lib/test_exchange_api.conf
+++ b/src/lib/test_exchange_api.conf
@@ -5,6 +5,15 @@
 # Persistant data storage for the testcase
 TALER_TEST_HOME = test_exchange_api_home/
 
+# Persistant data storage
+TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
+
+# Configuration files
+TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
+
+# Cached data, no big deal if lost
+TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
+
 [taler]
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index 2e1fb2d06..cc8430784 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
@@ -674,7 +674,6 @@ TALER_TESTING_wait_auditor_ready (const char *base_url)
  * @param main_cb routine containing all the commands to run.
  * @param main_cb_cls closure for @a main_cb, typically NULL.
  * @param config_file configuration file for the test-suite.
- *
  * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
  *         non-#GNUNET_OK codes are #GNUNET_SYSERR most of the
  *         time.
@@ -691,11 +690,11 @@ TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
   };
   int result;
 
-  if (GNUNET_OK !=
-      (result = GNUNET_CONFIGURATION_parse_and_run (config_filename,
-                                                    &
-                                                    TALER_TESTING_setup_with_exchange_cfg,
-                                                    &setup_ctx)))
+  result =
+    GNUNET_CONFIGURATION_parse_and_run (config_filename,
+                                        &TALER_TESTING_setup_with_exchange_cfg,
+                                        &setup_ctx);
+  if (GNUNET_OK != result)
     return result;
   return GNUNET_OK;
 }
-- 
cgit v1.2.3