1 files changed, 47 insertions, 41 deletions
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index e7f763e79..7e7ff8b45 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -1,6 +1,7 @@
 [PATHS]
-# Persistant data storage for the testcase
+# Persistent data storage for the testcase
 TALER_TEST_HOME = test_taler_exchange_httpd_home/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
 
 [taler]
 # Currency supported by the exchange (can only be one)
@@ -12,12 +13,15 @@ TINY_AMOUNT = EUR:0.01
 
 [exchange]
 
+AML_THRESHOLD = EUR:1000000
+
 # Directory with our terms of service.
 TERMS_DIR = ../../contrib/tos
 
 # Etag / filename for the terms of service.
 TERMS_ETAG = 0
 
+SIGNKEY_LEGAL_DURATION = 2 years
 
 # Directory with our privacy policy.
 PRIVACY_DIR = ../../contrib/pp
@@ -29,17 +33,10 @@ PRIVACY_ETAG = 0
 # how long is one signkey valid?
 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
-
 # HTTP port the exchange listens to
 PORT = 8081
 
@@ -65,44 +62,17 @@ CONFIG = "postgres:///talercheck"
 
 [exchange-account-1]
 PAYTO_URI = "payto://x-taler-bank/localhost:8082/3"
-WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/3/"
-
-
-# Wire fees are specified by wire method
-[fees-x-taler-bank]
-# Fees for the forseeable future...
-# If you see this after 2018, update to match the next 10 years...
-WIRE-FEE-2018 = EUR:0.01
-WIRE-FEE-2019 = EUR:0.01
-WIRE-FEE-2020 = EUR:0.01
-WIRE-FEE-2021 = EUR:0.01
-WIRE-FEE-2022 = EUR:0.01
-WIRE-FEE-2023 = EUR:0.01
-WIRE-FEE-2024 = EUR:0.01
-WIRE-FEE-2025 = EUR:0.01
-WIRE-FEE-2026 = EUR:0.01
-WIRE-FEE-2027 = EUR:0.01
-
-CLOSING-FEE-2018 = EUR:0.01
-CLOSING-FEE-2019 = EUR:0.01
-CLOSING-FEE-2020 = EUR:0.01
-CLOSING-FEE-2021 = EUR:0.01
-CLOSING-FEE-2022 = EUR:0.01
-CLOSING-FEE-2023 = EUR:0.01
-CLOSING-FEE-2024 = EUR:0.01
-CLOSING-FEE-2025 = EUR:0.01
-CLOSING-FEE-2026 = EUR:0.01
-CLOSING-FEE-2027 = EUR:0.01
-
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/3/taler-wire-gateway/"
 
 # Coins for the tests.
-[coin_eur_ct_1]
+[coin_eur_ct_1_rsa]
 value = EUR:0.01
 duration_withdraw = 7 days
 duration_spend = 2 years
@@ -111,9 +81,21 @@ fee_withdraw = EUR:0.00
 fee_deposit = EUR:0.00
 fee_refresh = EUR:0.01
 fee_refund = EUR:0.01
+CIPHER = RSA
 rsa_keysize = 1024
 
-[coin_eur_ct_10]
+[coin_eur_ct_1_cs]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_ct_10_rsa]
 value = EUR:0.10
 duration_withdraw = 7 days
 duration_spend = 2 years
@@ -122,9 +104,21 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
+CIPHER = RSA
 rsa_keysize = 1024
 
-[coin_eur_1]
+[coin_eur_ct_10_cs]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_1_rsa]
 value = EUR:1
 duration_withdraw = 7 days
 duration_spend = 2 years
@@ -133,4 +127,16 @@ fee_withdraw = EUR:0.01
 fee_deposit = EUR:0.01
 fee_refresh = EUR:0.03
 fee_refund = EUR:0.01
+CIPHER = RSA
 rsa_keysize = 1024
+
+[coin_eur_1_cs]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS