diff options
| author | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:04:35 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2020-01-19 17:06:12 +0100 |
| commit | b6543b8f9a0ef4de473568ba27e05ba50442ee97 (patch) | |
| tree | b29517e7aee281484ea960b92f53a6c13269904c /src/exchange | |
| parent | 707449aa8f1a84d453a302b245dd4e076d93171a (diff) | |
| parent | fc8bdb9b978334d52b80c318f9326394f855de2d (diff) | |
| download | exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.gz exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.tar.bz2 exchange-b6543b8f9a0ef4de473568ba27e05ba50442ee97.zip | |
fix merge conflict
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_validation.c | 6 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_httpd.conf | 9 |
2 files changed, 4 insertions, 11 deletions
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 |