From fc8bdb9b978334d52b80c318f9326394f855de2d Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 19 Jan 2020 17:03:19 +0100 Subject: consistently use payto URI instead of URL --- src/exchange/taler-exchange-httpd_validation.c | 6 +++--- src/exchange/test_taler_exchange_httpd.conf | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/exchange') diff --git a/src/exchange/taler-exchange-httpd_validation.c b/src/exchange/taler-exchange-httpd_validation.c index f5497c3c9..e3dd8e86e 100644 --- a/src/exchange/taler-exchange-httpd_validation.c +++ b/src/exchange/taler-exchange-httpd_validation.c @@ -110,13 +110,13 @@ load_account (void *cls, return; } if (0 != strcasecmp (url, - ai->payto_url)) + ai->payto_uri)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "URL in Wire response file `%s' does not match URL in configuration (%s vs %s)!\n", ai->wire_response_filename, url, - ai->payto_url); + ai->payto_uri); json_decref (wire_s); GNUNET_free (url); *ret = GNUNET_SYSERR; @@ -146,7 +146,7 @@ load_account (void *cls, *ret = GNUNET_SYSERR; return; } - method = TALER_payto_get_method (ai->payto_url); + method = TALER_payto_get_method (ai->payto_uri); if (GNUNET_OK == load_fee (method)) { diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf index 4061fbc55..954f24c69 100644 --- a/src/exchange/test_taler_exchange_httpd.conf +++ b/src/exchange/test_taler_exchange_httpd.conf @@ -47,18 +47,11 @@ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks CONFIG = "postgres:///talercheck" [account-1] - -# What is the main website of the bank? -URL = "payto://x-taler-bank/localhost:8082/3" - +PAYTO_URI = "payto://x-taler-bank/localhost:8082/3" WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json - METHOD = "x-taler-bank" - ENABLE_DEBIT = YES - ENABLE_CREDIT = YES - TALER_BANK_AUTH_METHOD = NONE -- cgit v1.2.3