From cb58740fbd9805807dba268c65498aaa171f004f Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 19 Jan 2020 19:12:47 +0100 Subject: remove redundant METHOD option, we can derive it from PAYTO_URI --- src/testing/test-taler-exchange-aggregator-postgres.conf | 1 - src/testing/test-taler-exchange-wirewatch-postgres.conf | 1 - src/testing/test_auditor_api.conf | 6 ------ src/testing/test_bank_api_fakebank.conf | 1 - src/testing/test_bank_api_pybank_twisted.conf | 1 - src/testing/test_exchange_api.conf | 4 ---- src/testing/test_exchange_api_keys_cherry_picking.conf | 4 ---- src/testing/test_exchange_api_twisted.conf | 3 --- 8 files changed, 21 deletions(-) (limited to 'src/testing') diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf index 6f5f9d83a..0f8ed70d9 100644 --- a/src/testing/test-taler-exchange-aggregator-postgres.conf +++ b/src/testing/test-taler-exchange-aggregator-postgres.conf @@ -62,7 +62,6 @@ WIRE_GATEWAY_URL = "http://localhost:8082/2/" WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x -method = "x-taler-bank" WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json ENABLE_DEBIT = YES ENABLE_CREDIT = YES diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf index 19db0e0bf..168e7eda3 100644 --- a/src/testing/test-taler-exchange-wirewatch-postgres.conf +++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf @@ -53,7 +53,6 @@ WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x -METHOD = x-taler-bank WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json PLUGIN = "taler_bank" ENABLE_DEBIT = YES diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf index 9a4804908..da84149b0 100644 --- a/src/testing/test_auditor_api.conf +++ b/src/testing/test_auditor_api.conf @@ -65,9 +65,6 @@ WIRE_GATEWAY_URL = "http://localhost:8082/42/" # wallets with the bank information for transfers to the exchange. WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json -# Which wire plugin should we used to access the account? -METHOD = x-taler-bank - [bank] HTTP_PORT = 8082 @@ -82,9 +79,6 @@ PAYTO_URI = "payto://x-taler-bank/localhost/2" # wallets with the bank information for transfers to the exchange. WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-2.json -# Which wire plugin should we used to access the account? -METHOD = x-taler-bank - # Authentication information for basic authentication WIRE_GATEWAY_AUTH_METHOD = "basic" USERNAME = user diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf index 3d448ec52..5d5053599 100644 --- a/src/testing/test_bank_api_fakebank.conf +++ b/src/testing/test_bank_api_fakebank.conf @@ -5,7 +5,6 @@ currency = KUDOS [exchange-account-2] PAYTO_URI = payto://x-taler-bank/localhost/2 -METHOD = x-taler-bank WIRE_GATEWAY_URL = "http://localhost:8081/2/" WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange diff --git a/src/testing/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf index 3801590bf..9fe0fa1cb 100644 --- a/src/testing/test_bank_api_pybank_twisted.conf +++ b/src/testing/test_bank_api_pybank_twisted.conf @@ -35,7 +35,6 @@ PAYTO_URI = payto://x-taler-bank/localhost/1 [exchange-account-2] PAYTO_URI = payto://x-taler-bank/localhost/Exchange -METHOD = x-taler-bank WIRE_GATEWAY_URL = "http://localhost:8888/taler-wire-gateway/Exchange/" WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf index ed74d89ec..6af202e30 100644 --- a/src/testing/test_exchange_api.conf +++ b/src/testing/test_exchange_api.conf @@ -64,8 +64,6 @@ 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 -# Which wire plugin should we used to access the account? -METHOD = x-taler-bank WIRE_GATEWAY_URL = "http://localhost:9081/42/" @@ -84,8 +82,6 @@ WIRE_GATEWAY_AUTH_METHOD = basic USERNAME = Exchange PASSWORD = x -METHOD = x-taler-bank - WIRE_GATEWAY_URL = "http://localhost:9081/2/" ENABLE_DEBIT = YES diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf index 6823e81de..0416c8eec 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.conf +++ b/src/testing/test_exchange_api_keys_cherry_picking.conf @@ -73,8 +73,6 @@ WIRE_RESPONSE = ${TALER_CONFIG_HOME}/iban.json # What is the URL of our bank account? Must match WIRE_RESPONSE above! PAYTO_URI = payto://x-taler-bank/localhost/42 -METHOD = "x-taler-bank" - WIRE_GATEWAY_URL = "http://localhost:9082/42/" @@ -88,8 +86,6 @@ PAYTO_URI = payto://x-taler-bank/localhost/2 WIRE_GATEWAY_URL = "http://localhost:9082/2/" -METHOD = "x-taler-bank" - # Authentication information for basic authentication TALER_BANK_AUTH_METHOD = "basic" USERNAME = user diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf index 5158aefeb..2cda46e5a 100644 --- a/src/testing/test_exchange_api_twisted.conf +++ b/src/testing/test_exchange_api_twisted.conf @@ -62,8 +62,6 @@ 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 -# Which wire plugin should we used to access the account? -METHOD = x-taler-bank WIRE_GATEWAY_URL = "http://localhost:9081/42/" WIRE_GATEWAY_AUTH_METHOD = NONE @@ -77,7 +75,6 @@ USERNAME = user PASSWORD = pass ENABLE_DEBIT = YES ENABLE_CREDIT = YES -METHOD = x-taler-bank [bank] -- cgit v1.2.3