aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/exchange-lib/test_exchange_api.c26
-rw-r--r--src/exchange-lib/test_exchange_api.conf6
-rw-r--r--src/exchange-lib/test_exchange_api_keys_cherry_picking.conf6
-rw-r--r--src/exchange-lib/testing_api_loop.c13
4 files changed, 23 insertions, 28 deletions
diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c
index 81c8542c0..fe3877790 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -2141,7 +2141,7 @@ interpreter_run (void *cls)
= TALER_BANK_admin_add_incoming (ctx,
"http://localhost:8082/", /* bank URL */
&auth,
- "https://exchange.com/", /* exchange URL */
+ "http://localhost:8081/", /* exchange URL */
subject,
&amount,
cmd->details.admin_add_incoming.debit_account_no,
@@ -3414,42 +3414,42 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-499c",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:4.98",
.details.check_bank_transfer.account_debit = 2,
.details.check_bank_transfer.account_credit = 42
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-99c1",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:0.98",
.details.check_bank_transfer.account_debit = 2,
.details.check_bank_transfer.account_credit = 42
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-99c2",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:0.98",
.details.check_bank_transfer.account_debit = 2,
.details.check_bank_transfer.account_credit = 42
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-9c",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:0.08",
.details.check_bank_transfer.account_debit = 2,
.details.check_bank_transfer.account_credit = 43
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-aai-1",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:5.01",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-aai-2",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:5.01",
.details.check_bank_transfer.account_debit = 424,
.details.check_bank_transfer.account_credit = 2
@@ -3516,7 +3516,7 @@ run (void *cls)
.label = "run-aggregator-refund" },
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-aai-3",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:5.01",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
@@ -3548,7 +3548,7 @@ run (void *cls)
/* Check that deposit did run */
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-pre-refund",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:4.97",
.details.check_bank_transfer.account_debit = 2,
.details.check_bank_transfer.account_credit = 42
@@ -3597,7 +3597,7 @@ run (void *cls)
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-aai-3b",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:5.01",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
@@ -3752,21 +3752,21 @@ run (void *cls)
/* check that we are empty before the rejection test */
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-pr1",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:5.01",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-pr2",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:2.02",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
},
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-pr3",
- .details.check_bank_transfer.exchange_base_url = "https://exchange.com/",
+ .details.check_bank_transfer.exchange_base_url = "http://localhost:8081/",
.details.check_bank_transfer.amount = "EUR:1.01",
.details.check_bank_transfer.account_debit = 42,
.details.check_bank_transfer.account_credit = 2
diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf
index 35267e340..7d8761f94 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/src/exchange-lib/test_exchange_api.conf
@@ -19,9 +19,9 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# How to access our database
DB = postgres
-# Base URL of the exchange. Note that the test expects exactly this
-# value in the wire transfers.
-BASE_URL = "https://exchange.com/"
+# Base URL of the exchange. Must be set to a URL where the
+# exchange (or the twister) is actually listening.
+BASE_URL = "http://localhost:8081/"
[exchangedb-postgres]
DB_CONN_STR = "postgres:///talercheck"
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
index b2d2fbc5f..38b952824 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking.conf
@@ -19,9 +19,9 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# How to access our database
DB = postgres
-# Base URL of the exchange. Note that the test expects exactly this
-# value in the wire transfers.
-BASE_URL = "https://exchange.com/"
+# Base URL of the exchange. Must be set to a URL where the
+# exchange (or the twister) is actually listening.
+BASE_URL = "http://localhost:8081/"
[exchangedb-postgres]
DB_CONN_STR = "postgres:///talercheck"
diff --git a/src/exchange-lib/testing_api_loop.c b/src/exchange-lib/testing_api_loop.c
index 78ae3611d..e179c209d 100644
--- a/src/exchange-lib/testing_api_loop.c
+++ b/src/exchange-lib/testing_api_loop.c
@@ -535,7 +535,6 @@ main_wrapper_exchange_connect (void *cls)
struct TALER_TESTING_Interpreter *is = main_ctx->is;
struct GNUNET_CONFIGURATION_Handle *cfg;
char *exchange_url;
- long long unsigned int exchange_port;
cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK != GNUNET_CONFIGURATION_load
@@ -543,21 +542,17 @@ main_wrapper_exchange_connect (void *cls)
return;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg,
+ GNUNET_CONFIGURATION_get_value_string (cfg,
"exchange",
- "PORT",
- &exchange_port))
+ "BASE_URL",
+ &exchange_url))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"exchange",
- "PORT");
+ "BASE_URL");
GNUNET_CONFIGURATION_destroy (cfg);
return;
}
- GNUNET_asprintf (&exchange_url,
- "http://localhost:%llu/",
- exchange_port);
-
GNUNET_assert ( NULL !=
(is->exchange = TALER_EXCHANGE_connect (is->ctx,
exchange_url,
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-06 12:28:15 +0000