summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-17 20:50:39 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-17 20:50:48 +0100
commit81d3b454e177b3cbc68e99795a526958f6992be3 (patch)
tree22139f9ca280992a669842974193a1b16dfc63e0
parent33877b2c55be2d9a4deaf56c709a7943dd00b62c (diff)
downloadexchange-81d3b454e177b3cbc68e99795a526958f6992be3.tar.gz
exchange-81d3b454e177b3cbc68e99795a526958f6992be3.tar.bz2
exchange-81d3b454e177b3cbc68e99795a526958f6992be3.zip
point out duplication, fix hard-coded '2'
-rw-r--r--src/include/taler_testing_lib.h2
-rw-r--r--src/lib/testing_api_helpers_bank.c11
2 files changed, 9 insertions, 4 deletions
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index c52635508..f884cd991 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -276,6 +276,8 @@ struct TALER_TESTING_BankConfiguration
/**
* Base URL of the exchange's bank account. Basically
* @e bank_url plus the exchange account.
+ *
+ * FIXME: remove? This duplicates exchange_auth.wire_gateway_url!
*/
char *exchange_account_url;
diff --git a/src/lib/testing_api_helpers_bank.c b/src/lib/testing_api_helpers_bank.c
index 5bc08fbf5..d6fac4bd8 100644
--- a/src/lib/testing_api_helpers_bank.c
+++ b/src/lib/testing_api_helpers_bank.c
@@ -403,17 +403,19 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
return GNUNET_SYSERR;
}
bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
- // FIXME: we should not hardcode exchange account number "2"
+
GNUNET_asprintf (&bc->exchange_auth.wire_gateway_url,
- "http://localhost:%u/2/",
- (unsigned int) fakebank_port);
+ "http://localhost:%u/%s/",
+ (unsigned int) fakebank_port,
+ EXCHANGE_ACCOUNT_NAME);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Using fakebank %s on port %u\n",
bc->exchange_auth.wire_gateway_url,
(unsigned int) fakebank_port);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fakebank port from config: %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Fakebank port from config: %u\n",
(unsigned int) fakebank_port);
GNUNET_CONFIGURATION_destroy (cfg);
@@ -425,6 +427,7 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
bc->bank_url = NULL;
return GNUNET_SYSERR;
}
+ /* FIXME: this duplicates bc->exchange_auth.wire_gateway_url */
GNUNET_asprintf (&bc->exchange_account_url,
"http://localhost:%u/%s/",
fakebank_port,