lookahead/duration options are in [exchange], not [exchange_keys], use consistently

3 files changed, 10 insertions, 28 deletions

diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf
index 8af93c183..49046b71f 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/src/exchange-lib/test_exchange_api.conf
@@ -9,7 +9,7 @@ TALER_TEST_HOME = test_exchange_api_home/
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 
-[exchange_keys]
+[exchange]
 
 # how long is one signkey valid?
 signkey_duration = 4 weeks
@@ -17,15 +17,10 @@ signkey_duration = 4 weeks
 # how long are the signatures with the signkey valid?
 legal_duration = 2 years
 
-# how long do we generate denomination and signing keys
-# ahead of time?
-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
 
-[exchange]
 # HTTP port the exchange listens to
 PORT = 8081
 
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
index 783ea6c28..ba82c1c34 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
@@ -8,7 +8,7 @@ TALER_TEST_HOME = test_exchange_api_home/
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 
-[exchange_keys]
+[exchange]
 
 # how long is one signkey valid?
 signkey_duration = 4 weeks
@@ -16,16 +16,13 @@ signkey_duration = 4 weeks
 # how long are the signatures with the signkey valid?
 legal_duration = 2 years
 
-# how long do we generate denomination and signing keys
-# ahead of time?
-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
 
+# Keep it short so we can prolong later!
+LOOKAHEAD_SIGN = 60 s
 
-[exchange]
 
 # HTTP port the exchange listens to
 PORT = 8081
@@ -40,9 +37,6 @@ DB = postgres
 # exchange (or the twister) is actually listening.
 BASE_URL = "http://localhost:8081/"
 
-# Keep it short so we can prolong later!
-LOOKAHEAD_SIGN = 60 s
-
 
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"
diff --git a/src/exchange-lib/test_exchange_api_twisted.conf b/src/exchange-lib/test_exchange_api_twisted.conf
index 142dd99f9..12a07a17e 100644
--- a/src/exchange-lib/test_exchange_api_twisted.conf
+++ b/src/exchange-lib/test_exchange_api_twisted.conf
@@ -33,23 +33,20 @@ TALER_TEST_HOME = test_exchange_api_home/
 # 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
-
-# how long do we generate denomination and signing keys
-# ahead of time?
-lookahead_sign = 32 weeks 1 day
+LEGAL_DURATION = 2 years
 
 # how long do we provide to clients denomination and signing keys
 # ahead of time?
-lookahead_provide = 4 weeks 1 day
+LOOKAHEAD_PROVIDE = 4 weeks 1 day
 
-[exchange]
+# Keep it short so the test runs fast.
+LOOKAHEAD_SIGN = 12 h
 
 # HTTP port the exchange listens to
 PORT = 8081
@@ -73,10 +70,6 @@ DB_CONN_STR = "postgres:///talercheck"
 [auditordb-postgres]
 DB_CONN_STR = "postgres:///talercheck"
 
-[exchange_keys]
-# Keep it short so the test runs fast.
-LOOKAHEAD_SIGN = 12 h
-
 [account-2]
 URL = payto://x-taler-bank/localhost:8082/2
 PLUGIN = taler_bank