aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/benchmark/taler-exchange-benchmark.c4
-rw-r--r--src/include/taler_testing_lib.h7
-rw-r--r--src/lib/test_auditor_api.c1
-rw-r--r--src/lib/test_bank_api.c5
-rw-r--r--src/lib/test_exchange_api.c1
-rw-r--r--src/lib/test_exchange_api_revocation.c1
-rw-r--r--src/lib/test_exchange_api_twisted.c1
-rw-r--r--src/lib/test_taler_exchange_wirewatch.c1
-rw-r--r--src/lib/testing_api_cmd_bank_admin_add_incoming.c5
-rw-r--r--src/lib/testing_api_cmd_bank_history_debit.c5
-rw-r--r--src/lib/testing_api_cmd_bank_transfer.c5
11 files changed, 4 insertions, 32 deletions
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index d2f1b8420..ae65d44bf 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -187,9 +187,7 @@ CMD_TRANSFER_TO_EXCHANGE (char *label, char *amount)
{
return TALER_TESTING_cmd_admin_add_incoming_retry
(TALER_TESTING_cmd_admin_add_incoming (label, amount,
- exchange_bank_account.
- wire_gateway_url,
- NULL,
+ &exchange_bank_account,
user_payto_url));
}
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 4c723def4..f279d6d01 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -831,8 +831,6 @@ TALER_TESTING_cmd_bank_credits (const char *label,
* Make a debit "history" CMD.
*
* @param label command label.
- * @param account_url base URL of the account offering the "history"
- * operation.
* @param auth authentication data
* @param start_row_reference reference to a command that can
* offer a row identifier, to be used as the starting row
@@ -842,7 +840,6 @@ TALER_TESTING_cmd_bank_credits (const char *label,
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_bank_debits (const char *label,
- const char *account_url,
const struct TALER_BANK_AuthenticationData *auth,
const char *start_row_reference,
long long num_results);
@@ -864,7 +861,6 @@ TALER_TESTING_cmd_bank_debits (const char *label,
struct TALER_TESTING_Command
TALER_TESTING_cmd_transfer (const char *label,
const char *amount,
- const char *bank_base_url,
const struct TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account,
const char *payto_credit_account,
@@ -879,8 +875,6 @@ TALER_TESTING_cmd_transfer (const char *label,
*
* @param label command label.
* @param amount amount to transfer.
- * @param exchange_base_url base URL of the exchange account that receives this
- * wire transer (which account receives money).
* @param payto_debit_account which account sends money.
* @param auth authentication data
* @return the command.
@@ -888,7 +882,6 @@ TALER_TESTING_cmd_transfer (const char *label,
struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming (const char *label,
const char *amount,
- const char *exchange_base_url,
const struct
TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account);
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index 0b3e97f6d..8302897c6 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -82,7 +82,6 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- 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 6e34399a8..4377c4fba 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -74,7 +74,6 @@ run (void *cls,
1),
TALER_TESTING_cmd_admin_add_incoming ("credit-1",
"KUDOS:5.01",
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_bank_credits ("history-1c",
@@ -82,25 +81,21 @@ run (void *cls,
NULL,
5),
TALER_TESTING_cmd_bank_debits ("history-1d",
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
5),
TALER_TESTING_cmd_admin_add_incoming ("credit-2",
"KUDOS:3.21",
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto),
TALER_TESTING_cmd_transfer ("debit-1",
"KUDOS:3.22",
- 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_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 e756f1573..d7db2ef9c 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -82,7 +82,6 @@ static struct TALER_TESTING_BankConfiguration bc;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- 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 d04bf9f8f..02253b208 100644
--- a/src/lib/test_exchange_api_revocation.c
+++ b/src/lib/test_exchange_api_revocation.c
@@ -68,7 +68,6 @@ run (void *cls,
*/
TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1",
"EUR:5.01",
- 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 831273c3b..c6a0a52a6 100644
--- a/src/lib/test_exchange_api_twisted.c
+++ b/src/lib/test_exchange_api_twisted.c
@@ -91,7 +91,6 @@ static struct GNUNET_OS_Process *twisterd;
*/
#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- 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 df71c10c1..dcdb2a61a 100644
--- a/src/lib/test_taler_exchange_wirewatch.c
+++ b/src/lib/test_taler_exchange_wirewatch.c
@@ -54,7 +54,6 @@ transfer_to_exchange (const char *label,
{
return TALER_TESTING_cmd_admin_add_incoming (label,
amount,
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
bc.user42_payto);
}
diff --git a/src/lib/testing_api_cmd_bank_admin_add_incoming.c b/src/lib/testing_api_cmd_bank_admin_add_incoming.c
index 2e274fbc3..fa3db3426 100644
--- a/src/lib/testing_api_cmd_bank_admin_add_incoming.c
+++ b/src/lib/testing_api_cmd_bank_admin_add_incoming.c
@@ -484,8 +484,6 @@ make_command (const char *label,
*
* @param label command label.
* @param amount amount to transfer.
- * @param exchange_base_url base URL of the account that receives this
- * wire transer (which account receives money).
* @param payto_debit_account which account sends money.
* @param auth authentication data
* @return the command.
@@ -494,13 +492,12 @@ struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming
(const char *label,
const char *amount,
- const char *exchange_base_url,
const struct TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account)
{
return make_command (label,
make_fts (amount,
- exchange_base_url,
+ auth->wire_gateway_url,
auth,
payto_debit_account));
}
diff --git a/src/lib/testing_api_cmd_bank_history_debit.c b/src/lib/testing_api_cmd_bank_history_debit.c
index 6b06fcd98..671c79d33 100644
--- a/src/lib/testing_api_cmd_bank_history_debit.c
+++ b/src/lib/testing_api_cmd_bank_history_debit.c
@@ -566,8 +566,6 @@ history_cleanup (void *cls,
* Make a "history" CMD.
*
* @param label command label.
- * @param account_url base URL of the account offering the "history"
- * operation.
* @param auth login data to use
* @param start_row_reference reference to a command that can
* offer a row identifier, to be used as the starting row
@@ -577,7 +575,6 @@ history_cleanup (void *cls,
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_bank_debits (const char *label,
- const char *account_url,
const struct TALER_BANK_AuthenticationData *auth,
const char *start_row_reference,
long long num_results)
@@ -585,7 +582,7 @@ TALER_TESTING_cmd_bank_debits (const char *label,
struct HistoryState *hs;
hs = GNUNET_new (struct HistoryState);
- hs->account_url = account_url;
+ hs->account_url = auth->wire_gateway_url;
hs->start_row_reference = start_row_reference;
hs->num_results = num_results;
hs->auth = *auth;
diff --git a/src/lib/testing_api_cmd_bank_transfer.c b/src/lib/testing_api_cmd_bank_transfer.c
index db6b9e24c..919946f6e 100644
--- a/src/lib/testing_api_cmd_bank_transfer.c
+++ b/src/lib/testing_api_cmd_bank_transfer.c
@@ -334,8 +334,6 @@ transfer_traits (void *cls,
*
* @param label command label.
* @param amount amount to transfer.
- * @param account_base_url base URL of the account that implements this
- * wire transer (which account gives money).
* @param auth authentication data to use
* @param payto_credit_account which account receives money.
* @param wtid wire transfer identifier to use
@@ -346,7 +344,6 @@ struct TALER_TESTING_Command
TALER_TESTING_cmd_transfer
(const char *label,
const char *amount,
- const char *account_base_url,
const struct TALER_BANK_AuthenticationData *auth,
const char *payto_debit_account,
const char *payto_credit_account,
@@ -356,7 +353,7 @@ TALER_TESTING_cmd_transfer
struct TransferState *fts;
fts = GNUNET_new (struct TransferState);
- fts->account_debit_url = account_base_url;
+ fts->account_debit_url = auth->wire_gateway_url;
fts->exchange_base_url = exchange_base_url;
fts->payto_debit_account = GNUNET_strdup (payto_debit_account);
fts->payto_credit_account = payto_credit_account;
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-09 10:08:45 +0000