From b1e305fb05ebc39d0c428ed02ef073ebfb3b82e0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 17 Dec 2020 16:19:28 +0100 Subject: [PATCH] remove obsolete configuration options --- .../config/exchange-common.conf | 65 ----------------- .../config/exchange-keyup.conf | 16 ----- src/auditor/generate-auditor-basedb.conf | 33 --------- src/auditor/test-auditor.conf | 1 - src/benchmark/benchmark.conf | 28 -------- src/exchange/test_taler_exchange_httpd.conf | 29 -------- src/exchange/test_taler_exchange_unix.conf | 28 -------- ...st-taler-exchange-aggregator-postgres.conf | 27 ------- ...est-taler-exchange-wirewatch-postgres.conf | 28 -------- src/testing/test_auditor_api.conf | 63 ---------------- src/testing/test_exchange_api.conf | 59 --------------- ...test_exchange_api_keys_cherry_picking.conf | 71 ------------------- src/testing/test_exchange_api_twisted.conf | 31 -------- 13 files changed, 479 deletions(-) diff --git a/contrib/exchange-template/config/exchange-common.conf b/contrib/exchange-template/config/exchange-common.conf index 5694995b6..615c3bf72 100644 --- a/contrib/exchange-template/config/exchange-common.conf +++ b/contrib/exchange-template/config/exchange-common.conf @@ -26,15 +26,6 @@ DB_CONN_STR = "postgres:///talercheck" # Accounts must have a payto:// URL URL = payto://METHOD/DETAILS -# To be included in /wire, accounts must have a signed wire file -# Must match URL. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json - -# For access to the account, we need to know the plugin. -PLUGIN = "taler_bank" - -# TBD: authentication data. - # Accounts need to be enabled for the aggregator to debit them. ENABLE_DEBIT = NO @@ -44,12 +35,6 @@ ENABLE_CREDIT = YES [account-2] URL = payto://x-taler-wire/bank/2 -# Response for /wire -# Must match URL. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json - -PLUGIN = taler_bank - # We also may need authentication data. TALER_BANK_AUTH_METHOD = "none" # or basic # TALER_TALER_TESTING_BANK_USERNAME = user @@ -62,53 +47,3 @@ ENABLE_DEBIT = YES ENABLE_CREDIT = YES -# Wire fees are specified by wire method, NOT by wire plugin. -[fees-x-taler-bank] -# Fees for the foreseeable 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 - -[fees-sepa] -# Fees for the foreseeable 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 diff --git a/contrib/exchange-template/config/exchange-keyup.conf b/contrib/exchange-template/config/exchange-keyup.conf index 382e121ce..8686e7082 100644 --- a/contrib/exchange-template/config/exchange-keyup.conf +++ b/contrib/exchange-template/config/exchange-keyup.conf @@ -1,19 +1,3 @@ -[exchange_keys] - -# 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 - # Coin definitions are detected because the section # name begins with "coin_". The rest of the diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf index a7a4e7c35..9f5292d7d 100644 --- a/src/auditor/generate-auditor-basedb.conf +++ b/src/auditor/generate-auditor-basedb.conf @@ -67,23 +67,14 @@ ALLOW_REGISTRATIONS = YES SERVE = http [exchangedb] -AUDITOR_BASE_DIR = ${TALER_DATA_HOME}/auditors/ -WIREFEE_BASE_DIR = ${TALER_DATA_HOME}/exchange/wirefees/ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks LEGAL_RESERVE_EXPIRATION_TIME = 7 years -[exchange_keys] -signkey_duration = 4 weeks -legal_duration = 2 years -lookahead_sign = 32 weeks 1 day -lookahead_provide = 4 weeks 1 day - [taler] CURRENCY = TESTKUDOS CURRENCY_ROUND_UNIT = TESTKUDOS:0.01 [exchange-account-1] -WIRE_RESPONSE = ${TALER_DATA_HOME}/exchange/account-1.json PAYTO_URI = payto://x-taler-bank/localhost/Exchange enable_debit = yes enable_credit = yes @@ -94,33 +85,9 @@ PASSWORD = x [merchant-account-merchant] PAYTO_URI = payto://x-taler-bank/localhost/42 -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/merchant/account-3.json HONOR_default = YES ACTIVE_default = YES -[fees-x-taler-bank] -wire-fee-2020 = TESTKUDOS:0.01 -closing-fee-2020 = TESTKUDOS:0.01 -wire-fee-2021 = TESTKUDOS:0.01 -closing-fee-2021 = TESTKUDOS:0.01 -wire-fee-2022 = TESTKUDOS:0.01 -closing-fee-2022 = TESTKUDOS:0.01 -wire-fee-2023 = TESTKUDOS:0.01 -closing-fee-2023 = TESTKUDOS:0.01 -wire-fee-2024 = TESTKUDOS:0.01 -closing-fee-2024 = TESTKUDOS:0.01 -wire-fee-2025 = TESTKUDOS:0.01 -closing-fee-2025 = TESTKUDOS:0.01 -wire-fee-2026 = TESTKUDOS:0.01 -closing-fee-2026 = TESTKUDOS:0.01 -wire-fee-2027 = TESTKUDOS:0.01 -closing-fee-2027 = TESTKUDOS:0.01 -wire-fee-2028 = TESTKUDOS:0.01 -closing-fee-2028 = TESTKUDOS:0.01 - -[merchant-instance-wireformat-default] -TEST_RESPONSE_FILE = ${TALER_CONFIG_HOME}/merchant/wire/tutorial.json - [merchant-exchange-default] EXCHANGE_BASE_URL = http://localhost:8081/ CURRENCY = TESTKUDOS diff --git a/src/auditor/test-auditor.conf b/src/auditor/test-auditor.conf index a6c484957..bbd27c919 100644 --- a/src/auditor/test-auditor.conf +++ b/src/auditor/test-auditor.conf @@ -3,7 +3,6 @@ DB = postgres TINY_AMOUNT = TESTKUDOS:0.01 [exchange-account-1] -WIRE_RESPONSE = ${TALER_DATA_HOME}/exchange/account-1.json PAYTO_URI = payto://x-taler-bank/localhost/Exchange enable_debit = yes enable_credit = yes diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf index b9d1d141d..ed02cfc2d 100644 --- a/src/benchmark/benchmark.conf +++ b/src/benchmark/benchmark.conf @@ -55,9 +55,6 @@ USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42 PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange" # What is the bank account (with the "Taler Bank" demo system)? Must end with "/". WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/ -# This is the response we give out for the /wire request. It provides -# wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-exchange.json # Authentication information for basic authentication WIRE_GATEWAY_AUTH_METHOD = "basic" username = Exchange @@ -68,31 +65,6 @@ enable_credit = YES -[fees-x-taler-bank] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - # Sections starting with "coin_" specify which denominations # the exchange should support (and their respective fee structure) [coin_eur_ct_1] diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf index b0e3801fb..80e0826b8 100644 --- a/src/exchange/test_taler_exchange_httpd.conf +++ b/src/exchange/test_taler_exchange_httpd.conf @@ -66,7 +66,6 @@ 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 WIRE_GATEWAY_AUTH_METHOD = basic @@ -74,34 +73,6 @@ 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 foreseeable 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 - - # Coins for the tests. [coin_eur_ct_1] value = EUR:0.01 diff --git a/src/exchange/test_taler_exchange_unix.conf b/src/exchange/test_taler_exchange_unix.conf index 1a65d801c..9ce4fb9fc 100644 --- a/src/exchange/test_taler_exchange_unix.conf +++ b/src/exchange/test_taler_exchange_unix.conf @@ -67,39 +67,11 @@ 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 TALER_BANK_AUTH_METHOD = NONE -# Wire fees are specified by wire method -[fees-x-taler-bank] -# Fees for the foreseeable 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 - - # Coins for the tests. [coin_eur_ct_1] value = EUR:0.01 diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf index dd03e0c42..a6981dc38 100644 --- a/src/testing/test-taler-exchange-aggregator-postgres.conf +++ b/src/testing/test-taler-exchange-aggregator-postgres.conf @@ -65,7 +65,6 @@ WIRE_GATEWAY_URL = "http://localhost:8082/2/" WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json ENABLE_DEBIT = YES ENABLE_CREDIT = YES TALER_BANK_AUTH_METHOD = NONE @@ -73,32 +72,6 @@ TALER_BANK_AUTH_METHOD = NONE [bank] HTTP_PORT = 8082 -[fees-x-taler-bank] - -# Fees for the foreseeable 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 - [coin_eur_ct_1] value = EUR:0.01 duration_withdraw = 7 days diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf index f7c4f2908..afa1f34f7 100644 --- a/src/testing/test-taler-exchange-wirewatch-postgres.conf +++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf @@ -55,8 +55,6 @@ WIRE_GATEWAY_URL = "http://localhost:8082/2/" WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x - -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json PLUGIN = "taler_bank" ENABLE_DEBIT = YES ENABLE_CREDIT = YES @@ -65,32 +63,6 @@ TALER_BANK_AUTH_METHOD = NONE [bank] HTTP_PORT = 8082 -[fees-x-taler-bank] - -# Fees for the foreseeable 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 - # Need at least one coin, otherwise Exchange # refuses to start. [coin_eur_ct_1] diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf index 1d1ad8c08..294381d49 100644 --- a/src/testing/test_auditor_api.conf +++ b/src/testing/test_auditor_api.conf @@ -27,10 +27,6 @@ signkey_duration = 4 weeks legal_duration = 2 years signkey_legal_duration = 2 years -# 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 @@ -63,9 +59,6 @@ CONFIG = "postgres:///talercheck" # What is the URL of our account? PAYTO_URI = "payto://x-taler-bank/localhost/42" WIRE_GATEWAY_URL = "http://localhost:8082/42/" -# This is the response we give out for the /wire request. It provides -# wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json [bank] HTTP_PORT = 8082 @@ -77,10 +70,6 @@ HTTP_PORT = 8082 WIRE_GATEWAY_URL = "http://localhost:8082/2/" PAYTO_URI = "payto://x-taler-bank/localhost/2" -# This is the response we give out for the /wire request. It provides -# wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json - # Authentication information for basic authentication WIRE_GATEWAY_AUTH_METHOD = "basic" USERNAME = user @@ -91,58 +80,6 @@ ENABLE_DEBIT = YES ENABLE_CREDIT = YES -# Sections starting with "fee-" configure the wire fee for the -# respective wire method. -[fees-iban] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - -[fees-x-taler-bank] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - # Sections starting with "coin_" specify which denominations # the exchange should support (and their respective fee structure) [coin_eur_ct_1] diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf index be2703f16..a461620dd 100644 --- a/src/testing/test_exchange_api.conf +++ b/src/testing/test_exchange_api.conf @@ -68,9 +68,6 @@ CONFIG = "postgres:///talercheck" [exchange-account-1] # What is the URL of our account? PAYTO_URI = "payto://x-taler-bank/localhost/42" -# This is the response we give out for the /wire request. It provides -# wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json WIRE_GATEWAY_URL = "http://localhost:9081/42/" @@ -81,10 +78,6 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/" # What is the bank account (with the "Taler Bank" demo system)? PAYTO_URI = "payto://x-taler-bank/localhost/2" -# This is the response we give out for the /wire request. It provides -# wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json - WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x @@ -98,58 +91,6 @@ ENABLE_CREDIT = YES [bank] HTTP_PORT = 9081 -# Sections starting with "fee-" configure the wire fee for the -# respective wire method. -[fees-iban] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - -[fees-x-taler-bank] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - # Sections starting with "coin_" specify which denominations # the exchange should support (and their respective fee structure) [coin_eur_ct_1] diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf index 437f32ee3..1ce82bd4c 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.conf +++ b/src/testing/test_exchange_api_keys_cherry_picking.conf @@ -25,8 +25,6 @@ PORT = 8083 [exchange] -KEYDIR = ${TALER_TEST_HOME}/.local/share/taler/exchange/live-keys/ - # how long is one signkey valid? signkey_duration = 5 seconds @@ -99,75 +97,6 @@ ENABLE_CREDIT = YES [bank] HTTP_PORT=8082 -[fees-x-taler-bank] -# Fees for the foreseeable future... -# If you see this after 2017, update to match the next 10 years... -WIRE-FEE-2017 = EUR:0.01 -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 -WIRE-FEE-2028 = EUR:0.01 -WIRE-FEE-2029 = EUR:0.01 -WIRE-FEE-2030 = EUR:0.01 -WIRE-FEE-2031 = EUR:0.01 -WIRE-FEE-2032 = EUR:0.01 -WIRE-FEE-2033 = EUR:0.01 -WIRE-FEE-2034 = EUR:0.01 -WIRE-FEE-2035 = EUR:0.01 - -CLOSING-FEE-2017 = 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 -CLOSING-FEE-2028 = EUR:0.01 -CLOSING-FEE-2029 = EUR:0.01 -CLOSING-FEE-2030 = EUR:0.01 -CLOSING-FEE-2031 = EUR:0.01 -CLOSING-FEE-2032 = EUR:0.01 -CLOSING-FEE-2033 = EUR:0.01 -CLOSING-FEE-2034 = EUR:0.01 -CLOSING-FEE-2035 = EUR:0.01 - - -[fees-iban] -# Fees for the foreseeable future... -# If you see this after 2017, update to match the next 10 years... -WIRE-FEE-2017 = EUR:0.01 -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 - -CLOSING-FEE-2017 = 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 - [exchangedb] duration_overlap = 1 s diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf index 7865d0b3e..4c7e0ce61 100644 --- a/src/testing/test_exchange_api_twisted.conf +++ b/src/testing/test_exchange_api_twisted.conf @@ -1,17 +1,13 @@ # This file is in the public domain. -# - [PATHS] # Persistent data storage for the testcase TALER_TEST_HOME = test_exchange_api_home/ - [taler] # Currency supported by the exchange (can only be one) CURRENCY = EUR CURRENCY_ROUND_UNIT = EUR:0.01 - [exchange] # how long is one signkey valid? @@ -63,7 +59,6 @@ CONFIG = "postgres:///talercheck" PAYTO_URI = "payto://x-taler-bank/localhost/42" # This is the response we give out for the /wire request. It provides # wallets with the bank information for transfers to the exchange. -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json WIRE_GATEWAY_URL = "http://localhost:9081/42/" WIRE_GATEWAY_AUTH_METHOD = NONE @@ -71,7 +66,6 @@ WIRE_GATEWAY_AUTH_METHOD = NONE [exchange-account-2] PAYTO_URI = payto://x-taler-bank/localhost/2 WIRE_GATEWAY_URL = "http://localhost:8082/2/" -WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json WIRE_GATEWAY_AUTH_METHOD = BASIC USERNAME = user PASSWORD = pass @@ -109,31 +103,6 @@ UNIX_MATCH_GID = YES # FORCESTART = NO -[fees-x-taler-bank] -# Fees for the foreseeable future... -# If you see this after 2017, 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 - [coin_eur_ct_1] value = EUR:0.01 duration_withdraw = 7 days