summaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-01-19 17:03:19 +0100
committerFlorian Dold <florian.dold@gmail.com>2020-01-19 17:03:19 +0100
commitfc8bdb9b978334d52b80c318f9326394f855de2d (patch)
tree428c6b9235dee248bef4fc7e7c41b029495b0d0f /src/testing
parent9f522baadcf3b5288d35216962a91b5aeb688820 (diff)
downloadexchange-fc8bdb9b978334d52b80c318f9326394f855de2d.tar.gz
exchange-fc8bdb9b978334d52b80c318f9326394f855de2d.tar.bz2
exchange-fc8bdb9b978334d52b80c318f9326394f855de2d.zip
consistently use payto URI instead of URL
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test-taler-exchange-aggregator-postgres.conf2
-rw-r--r--src/testing/test-taler-exchange-wirewatch-postgres.conf2
-rw-r--r--src/testing/test_auditor_api.conf4
-rw-r--r--src/testing/test_bank_api_fakebank.conf2
-rw-r--r--src/testing/test_bank_api_fakebank_twisted.conf4
-rw-r--r--src/testing/test_bank_api_pybank.conf2
-rw-r--r--src/testing/test_bank_api_pybank_twisted.conf4
-rw-r--r--src/testing/test_exchange_api.conf4
-rw-r--r--src/testing/test_exchange_api_home/.config/taler/account-1.json5
-rw-r--r--src/testing/test_exchange_api_home/.config/taler/account-2.json2
-rw-r--r--src/testing/test_exchange_api_home/.config/taler/test.json8
-rw-r--r--src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json5
-rw-r--r--src/testing/test_exchange_api_keys_cherry_picking.conf4
-rw-r--r--src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json2
-rw-r--r--src/testing/test_exchange_api_twisted.conf4
-rw-r--r--src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json2
-rw-r--r--src/testing/testing_api_cmd_insert_deposit.c2
-rw-r--r--src/testing/testing_api_cmd_wire.c2
-rw-r--r--src/testing/testing_api_helpers_bank.c10
19 files changed, 26 insertions, 44 deletions
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index 7f22acd2..dab0f74a 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -57,7 +57,7 @@ LEGAL_RESERVE_EXPIRATION_TIME = 7 years
[account-1]
# What is the account URL?
-URL = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2"
WIRE_GATEWAY_URL = "http://localhost:8082/2/"
WIRE_GATEWAY_AUTH_METHOD = basic
USERNAME = Exchange
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index ae5cd7ef..740fbe87 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -46,7 +46,7 @@ PORT = 8083
[account-1]
# What is the account URL?
-URL = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2"
WIRE_GATEWAY_URL = "http://localhost:8082/2/"
WIRE_GATEWAY_AUTH_METHOD = basic
diff --git a/src/testing/test_auditor_api.conf b/src/testing/test_auditor_api.conf
index 7bb57c3a..dab354cd 100644
--- a/src/testing/test_auditor_api.conf
+++ b/src/testing/test_auditor_api.conf
@@ -59,7 +59,7 @@ CONFIG = "postgres:///talercheck"
# advertised in /wire.
[account-1]
# What is the URL of our account?
-URL = "payto://x-taler-bank/localhost/42"
+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.
@@ -76,7 +76,7 @@ HTTP_PORT = 8082
[account-2]
# What is the bank account (with the "Taler Bank" demo system)?
WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-URL = "payto://x-taler-bank/localhost/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.
diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf
index 5c9e5e3a..f3325986 100644
--- a/src/testing/test_bank_api_fakebank.conf
+++ b/src/testing/test_bank_api_fakebank.conf
@@ -4,7 +4,7 @@
currency = KUDOS
[account-2]
-URL = payto://x-taler-bank/localhost/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
diff --git a/src/testing/test_bank_api_fakebank_twisted.conf b/src/testing/test_bank_api_fakebank_twisted.conf
index 4455ac74..3b7b4961 100644
--- a/src/testing/test_bank_api_fakebank_twisted.conf
+++ b/src/testing/test_bank_api_fakebank_twisted.conf
@@ -28,7 +28,7 @@ http_port = 8081
database = postgres:///talercheck
[account-1]
-URL = payto://x-taler-bank/localhost:8081/1
+PAYTO_URI = payto://x-taler-bank/localhost:8081/1
[account-2]
-URL = payto://x-taler-bank/localhost:8081/2
+PAYTO_URI = payto://x-taler-bank/localhost:8081/2
diff --git a/src/testing/test_bank_api_pybank.conf b/src/testing/test_bank_api_pybank.conf
index 1d5f4a2d..0e1036da 100644
--- a/src/testing/test_bank_api_pybank.conf
+++ b/src/testing/test_bank_api_pybank.conf
@@ -4,7 +4,7 @@
currency = KUDOS
[account-2]
-URL = payto://x-taler-bank/localhost/Exchange
+PAYTO_URI = payto://x-taler-bank/localhost/Exchange
METHOD = x-taler-bank
WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/Exchange/"
WIRE_GATEWAY_AUTH_METHOD = basic
diff --git a/src/testing/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf
index a2085c38..e5408674 100644
--- a/src/testing/test_bank_api_pybank_twisted.conf
+++ b/src/testing/test_bank_api_pybank_twisted.conf
@@ -30,11 +30,11 @@ database = postgres:///talercheck
[account-1]
-URL = payto://x-taler-bank/localhost/1
+PAYTO_URI = payto://x-taler-bank/localhost/1
[account-2]
-URL = payto://x-taler-bank/localhost/Exchange
+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
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 291e0a0e..028f1d7e 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -60,7 +60,7 @@ CONFIG = "postgres:///talercheck"
# advertised in /wire.
[account-1]
# What is the URL of our account?
-URL = "payto://x-taler-bank/localhost/42"
+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
@@ -74,7 +74,7 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/"
[account-2]
# What is the bank account (with the "Taler Bank" demo system)?
-URL = "payto://x-taler-bank/localhost/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.
diff --git a/src/testing/test_exchange_api_home/.config/taler/account-1.json b/src/testing/test_exchange_api_home/.config/taler/account-1.json
deleted file mode 100644
index 48093f2a..00000000
--- a/src/testing/test_exchange_api_home/.config/taler/account-1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "url": "payto://sepa/CH9300762011623852957",
- "salt": "N83T9J9202WCC8TQFDMJDWEGZNBEKA33C1ZM241VNYH88RZNTHPW509Y1M2YF7Y098R8VRESWQ05H03BK1SPAZCWE54KARDCKT5N8AG",
- "master_sig": "D4V5GJ998YK7D6N0N56AD0J6MZNFEW6MRZT2CFPVQ5ME3NMQ59AA2007CXYESSFGRN70CNCFM06858QSSENCWTZM8VHEJ93YQ20ZJ1R"
-} \ No newline at end of file
diff --git a/src/testing/test_exchange_api_home/.config/taler/account-2.json b/src/testing/test_exchange_api_home/.config/taler/account-2.json
index f39677ef..21a7500b 100644
--- a/src/testing/test_exchange_api_home/.config/taler/account-2.json
+++ b/src/testing/test_exchange_api_home/.config/taler/account-2.json
@@ -1,4 +1,4 @@
{
- "url": "payto://x-taler-bank/localhost/2",
+ "payto_uri": "payto://x-taler-bank/localhost/2",
"master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
} \ No newline at end of file
diff --git a/src/testing/test_exchange_api_home/.config/taler/test.json b/src/testing/test_exchange_api_home/.config/taler/test.json
deleted file mode 100644
index eca39424..00000000
--- a/src/testing/test_exchange_api_home/.config/taler/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "salt": "AZPRFVJ58NM6M7J5CZQPJAH3EW5DYM52AEZ9Y1C1ER3W94QV8D8TQKF6CK8MYQRA9QMSKDQTGZ306ZS9GQ0M6R01CJ20KPP49WFDZK8",
- "name": "The exchange",
- "account_number": 3,
- "bank_url": "http://localhost:8082/",
- "type": "test",
- "sig": "RPQXP9S4P8PQP7HEZQNRSZCT0ATNEP8GW0P5TPM34V5RX86FCD670V44R9NETSYDDKB8SZV7TKY9PAJYTY51D3VDWY9XXQ5BPFRXR28"
-}
diff --git a/src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json b/src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json
deleted file mode 100644
index a6dc167e..00000000
--- a/src/testing/test_exchange_api_home/.config/taler/x-taler-bank.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "url": "payto://x-taler-bank/http://localhost:8082/2",
- "master_sig": "KQ0BWSCNVR7HGGSAMCYK8ZM30RBS1MHMXT3QBN01PZWC9TV72FEE5RJ7T84C8134EPV6WEBXXY2MTFNE8ZXST6JEJQKR8HX6FQPVY10",
- "master_pub": "98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG"
-}
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
index c5a69df3..ea516168 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -71,7 +71,7 @@ CONFIG = "postgres:///talercheck"
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/iban.json
# What is the URL of our bank account? Must match WIRE_RESPONSE above!
-URL = payto://x-taler-bank/localhost/42
+PAYTO_URI = payto://x-taler-bank/localhost/42
METHOD = "x-taler-bank"
@@ -84,7 +84,7 @@ WIRE_GATEWAY_URL = "http://localhost:9082/42/"
WIRE_RESPONSE = ${TALER_CONFIG_HOME}/x-taler-bank.json
# What is the URL of our bank account? Must match WIRE_RESPONSE above!
-URL = payto://x-taler-bank/localhost/2
+PAYTO_URI = payto://x-taler-bank/localhost/2
WIRE_GATEWAY_URL = "http://localhost:9082/2/"
diff --git a/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json b/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json
index f39677ef..21a7500b 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json
+++ b/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json
@@ -1,4 +1,4 @@
{
- "url": "payto://x-taler-bank/localhost/2",
+ "payto_uri": "payto://x-taler-bank/localhost/2",
"master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
} \ No newline at end of file
diff --git a/src/testing/test_exchange_api_twisted.conf b/src/testing/test_exchange_api_twisted.conf
index 28b254e6..b09f8aa5 100644
--- a/src/testing/test_exchange_api_twisted.conf
+++ b/src/testing/test_exchange_api_twisted.conf
@@ -58,7 +58,7 @@ CONFIG = "postgres:///talercheck"
[account-1]
# What is the URL of our account?
-URL = "payto://x-taler-bank/localhost/42"
+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
@@ -69,7 +69,7 @@ WIRE_GATEWAY_AUTH_METHOD = NONE
[account-2]
-URL = payto://x-taler-bank/localhost/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
diff --git a/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json b/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json
index f39677ef..21a7500b 100644
--- a/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json
+++ b/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json
@@ -1,4 +1,4 @@
{
- "url": "payto://x-taler-bank/localhost/2",
+ "payto_uri": "payto://x-taler-bank/localhost/2",
"master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
} \ No newline at end of file
diff --git a/src/testing/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c
index b66a4bfa..35652800 100644
--- a/src/testing/testing_api_cmd_insert_deposit.c
+++ b/src/testing/testing_api_cmd_insert_deposit.c
@@ -184,7 +184,7 @@ insert_deposit_run (void *cls,
deposit.receiver_wire_account
= json_pack ("{s:s, s:s}",
"salt", "this-is-a-salt-value",
- "url", str);
+ "payto_uri", str);
GNUNET_free (str);
}
diff --git a/src/testing/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c
index 5d1f2454..05ad604c 100644
--- a/src/testing/testing_api_cmd_wire.c
+++ b/src/testing/testing_api_cmd_wire.c
@@ -105,7 +105,7 @@ wire_cb (void *cls,
{
char *method;
- method = TALER_payto_get_method (accounts[i].url);
+ method = TALER_payto_get_method (accounts[i].payto_uri);
if (0 == strcmp (ws->expected_method,
method))
{
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
index dbe89e63..7b8b203a 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -263,12 +263,12 @@ TALER_TESTING_prepare_bank (const char *config_filename,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
config_section,
- "URL", /* FIXME: config should be renamed to payto_uri, it's not an url even! */
+ "PAYTO_URI",
&exchange_payto_uri))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
config_section,
- "URL");
+ "PAYTO_URI");
GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR;
}
@@ -418,12 +418,12 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
config_section,
- "URL", /* FIXME: config should be renamed to payto_uri, it's not an url even! */
+ "PAYTO_URI",
&exchange_payto_uri))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
config_section,
- "URL");
+ "PAYTO_URI");
GNUNET_CONFIGURATION_destroy (cfg);
return GNUNET_SYSERR;
}
@@ -485,7 +485,7 @@ json_t *
TALER_TESTING_make_wire_details (const char *payto)
{
return json_pack ("{s:s, s:s}",
- "url", payto,
+ "payto_uri", payto,
"salt",
"test-salt (must be constant for aggregation tests)");
}