summaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-07-04 00:43:24 +0200
committerChristian Grothoff <christian@grothoff.org>2018-07-04 00:43:24 +0200
commit52fa78b448394f1fcd2faec648c0ed3d04d4c7de (patch)
tree7230cf30b063784e5f1421e917507adc0d6d6355 /src/exchange
parentbc5d9b492f609ac08573052288d0503b6d044cb5 (diff)
downloadexchange-52fa78b448394f1fcd2faec648c0ed3d04d4c7de.tar.gz
exchange-52fa78b448394f1fcd2faec648c0ed3d04d4c7de.tar.bz2
exchange-52fa78b448394f1fcd2faec648c0ed3d04d4c7de.zip
lookahead/duration options are in [exchange], not [exchange_keys], use consistently
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_keystate.c8
-rw-r--r--src/exchange/test_taler_exchange_httpd.conf22
2 files changed, 13 insertions, 17 deletions
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