[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 02/02: remove redundant exchange_account_url
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 02/02: remove redundant exchange_account_url |
|
Date: |
Sat, 18 Jan 2020 04:10:09 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository exchange.
commit 22bd615fa973eef25438fa609c3605f33e927817
Author: Florian Dold <address@hidden>
AuthorDate: Sat Jan 18 04:10:02 2020 +0100
remove redundant exchange_account_url
---
src/include/taler_testing_lib.h | 7 -------
src/lib/test_auditor_api.c | 2 +-
src/lib/test_bank_api.c | 14 +++++++-------
src/lib/test_exchange_api.c | 2 +-
src/lib/test_exchange_api_revocation.c | 2 +-
src/lib/test_exchange_api_twisted.c | 2 +-
src/lib/test_taler_exchange_wirewatch.c | 2 +-
src/lib/testing_api_helpers_bank.c | 6 ------
8 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 4426e65a..781f1b13 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -268,13 +268,6 @@ TALER_TESTING_url_port_free (const char *url);
*/
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;
/**
* Authentication data for the exchange user at the bank.
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index 0158a368..0b3e97f6 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -82,7 +82,7 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url, \
&bc.exchange_auth, \
bc.user42_payto)
diff --git a/src/lib/test_bank_api.c b/src/lib/test_bank_api.c
index 71a52c6a..bbb957bd 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -69,40 +69,40 @@ run (void *cls,
{
struct TALER_TESTING_Command commands[] = {
TALER_TESTING_cmd_bank_credits ("history-0",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
1),
TALER_TESTING_cmd_admin_add_incoming ("credit-1",
"KUDOS:5.01",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_bank_credits ("history-1c",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
TALER_TESTING_cmd_bank_debits ("history-1d",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
TALER_TESTING_cmd_admin_add_incoming ("credit-2",
"KUDOS:3.21",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_transfer ("debit-1",
"KUDOS:3.22",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.exchange_payto,
bc.user42_payto,
&wtid,
"http://exchange.example.com/";),
TALER_TESTING_cmd_bank_debits ("history-2b",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c
index 1351ce8c..e756f157 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -82,7 +82,7 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url,
\
&bc.exchange_auth, \
bc.user42_payto)
diff --git a/src/lib/test_exchange_api_revocation.c
b/src/lib/test_exchange_api_revocation.c
index 1c980cf4..d04bf9f8 100644
--- a/src/lib/test_exchange_api_revocation.c
+++ b/src/lib/test_exchange_api_revocation.c
@@ -68,7 +68,7 @@ run (void *cls,
*/
TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1",
"EUR:5.01",
- bc.exchange_account_url,
+ bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1",
diff --git a/src/lib/test_exchange_api_twisted.c
b/src/lib/test_exchange_api_twisted.c
index 71406bb5..831273c3 100644
--- a/src/lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
@@ -91,7 +91,7 @@ static struct GNUNET_OS_Process *twisterd;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- bc.exchange_account_url, \
+ bc.exchange_auth.wire_gateway_url, \
&bc.exchange_auth, \
bc.user42_payto)
diff --git a/src/lib/test_taler_exchange_wirewatch.c
b/src/lib/test_taler_exchange_wirewatch.c
index 20aab59c..df71c10c 100644
--- a/src/lib/test_taler_exchange_wirewatch.c
+++ b/src/lib/test_taler_exchange_wirewatch.c
@@ -54,7 +54,7 @@ transfer_to_exchange (const char *label,
{
return TALER_TESTING_cmd_admin_add_incoming (label,
amount,
- bc.exchange_account_url,
+
bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto);
}
diff --git a/src/lib/testing_api_helpers_bank.c
b/src/lib/testing_api_helpers_bank.c
index c331cdeb..cdb69093 100644
--- a/src/lib/testing_api_helpers_bank.c
+++ b/src/lib/testing_api_helpers_bank.c
@@ -361,7 +361,6 @@ TALER_TESTING_prepare_bank (const char *config_filename,
return GNUNET_SYSERR;
}
GNUNET_CONFIGURATION_destroy (cfg);
- bc->exchange_account_url = GNUNET_strdup
(bc->exchange_auth.wire_gateway_url);
bc->exchange_payto = exchange_payto_uri;
bc->user42_payto = "payto://x-taler-bank/localhost/42";
bc->user43_payto = "payto://x-taler-bank/localhost/43";
@@ -457,11 +456,6 @@ TALER_TESTING_prepare_fakebank (const char
*config_filename,
bc->exchange_auth.wire_gateway_url = NULL;
return GNUNET_SYSERR;
}
- /* FIXME: this duplicates bc->exchange_auth.wire_gateway_url */
- bc->exchange_account_url = GNUNET_strdup
(bc->exchange_auth.wire_gateway_url);
- GNUNET_assert (NULL != bc->exchange_account_url);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "fakebank account URL: %s\n",
- bc->exchange_account_url);
/* Now we know it's the fake bank, for purpose of authentication, we
* don't have any auth. */
bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
--
To stop receiving notification emails like this one, please contact
address@hidden.