From 52fa78b448394f1fcd2faec648c0ed3d04d4c7de Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 4 Jul 2018 00:43:24 +0200
Subject: lookahead/duration options are in [exchange], not [exchange_keys],
 use consistently

---
 src/exchange/taler-exchange-httpd_keystate.c |  8 ++++----
 src/exchange/test_taler_exchange_httpd.conf  | 22 +++++++++-------------
 2 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'src/exchange')

diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c
index 409e55b47..987a938fc 100644
--- a/src/exchange/taler-exchange-httpd_keystate.c
+++ b/src/exchange/taler-exchange-httpd_keystate.c
@@ -572,13 +572,13 @@ TALER_EXCHANGE_conf_duration_provide ()
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "exchange_keys",
-                                           "lookahead_provide",
+                                           "exchange",
+                                           "LOOKAHEAD_PROVIDE",
                                            &rel))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange_keys",
-                               "lookahead_provide",
+                               "exchange",
+                               "LOOKAHEAD_PROVIDE",
                                "time value required");
     GNUNET_assert (0);
   }
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index 39ae75d06..01d0acd1b 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -2,30 +2,26 @@
 # Persistant data storage for the testcase
 TALER_TEST_HOME = test_taler_exchange_httpd_home/
 
+[taler]
+# Currency supported by the exchange (can only be one)
+CURRENCY = EUR
 
-[exchange_keys]
+
+[exchange]
 
 # how long is one signkey valid?
-signkey_duration = 4 weeks
+SIGNKEY_DURATION = 4 weeks
 
 # how long are the signatures with the signkey valid?
-legal_duration = 2 years
+LEGAL_DURATION = 2 years
 
 # how long do we generate denomination and signing keys
 # ahead of time?
-lookahead_sign = 32 weeks 1 day
+LOOKAHEAD_SIGN = 32 weeks 1 day
 
 # how long do we provide to clients denomination and signing keys
 # ahead of time?
-lookahead_provide = 4 weeks 1 day
-
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-
-
-[exchange]
+LOOKAHEAD_PROVIDE = 4 weeks 1 day
 
 # HTTP port the exchange listens to
 PORT = 8081
-- 
cgit v1.2.3