[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (22bd615f -> 0cebe32f)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (22bd615f -> 0cebe32f) |
|
Date: |
Sat, 18 Jan 2020 04:20:35 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository exchange.
from 22bd615f remove redundant exchange_account_url
new 47698761 remove redundant arg
new 0cebe32f dce: redundant arg
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/benchmark/taler-exchange-benchmark.c | 4 +---
src/include/taler_testing_lib.h | 10 ----------
src/lib/test_auditor_api.c | 1 -
src/lib/test_bank_api.c | 7 -------
src/lib/test_bank_api_twisted.c | 1 -
src/lib/test_exchange_api.c | 1 -
src/lib/test_exchange_api_revocation.c | 1 -
src/lib/test_exchange_api_twisted.c | 1 -
src/lib/test_taler_exchange_wirewatch.c | 1 -
src/lib/testing_api_cmd_bank_admin_add_incoming.c | 5 +----
src/lib/testing_api_cmd_bank_history_credit.c | 5 +----
src/lib/testing_api_cmd_bank_history_debit.c | 5 +----
src/lib/testing_api_cmd_bank_transfer.c | 5 +----
13 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/src/benchmark/taler-exchange-benchmark.c
b/src/benchmark/taler-exchange-benchmark.c
index d2f1b842..ae65d44b 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 781f1b13..f279d6d0 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -811,8 +811,6 @@ TALER_TESTING_has_in_name (const char *prog,
* Make a credit "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
@@ -823,7 +821,6 @@ TALER_TESTING_has_in_name (const char *prog,
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_bank_credits (const char *label,
- const char *account_url,
const struct
TALER_BANK_AuthenticationData *auth,
const char *start_row_reference,
@@ -834,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
@@ -845,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);
@@ -867,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,
@@ -882,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.
@@ -891,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 0b3e97f6..8302897c 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 bbb957bd..4377c4fb 100644
--- a/src/lib/test_bank_api.c
+++ b/src/lib/test_bank_api.c
@@ -69,40 +69,33 @@ run (void *cls,
{
struct TALER_TESTING_Command commands[] = {
TALER_TESTING_cmd_bank_credits ("history-0",
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
NULL,
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",
- bc.exchange_auth.wire_gateway_url,
&bc.exchange_auth,
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_bank_api_twisted.c b/src/lib/test_bank_api_twisted.c
index e0014880..2ec95ec0 100644
--- a/src/lib/test_bank_api_twisted.c
+++ b/src/lib/test_bank_api_twisted.c
@@ -91,7 +91,6 @@ run (void *cls,
TALER_TESTING_cmd_wait_service ("wait-service",
twister_url),
TALER_TESTING_cmd_bank_credits ("history-0",
- 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 e756f157..d7db2ef9 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 d04bf9f8..02253b20 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 831273c3..c6a0a52a 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 df71c10c..dcdb2a61 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 2e274fbc..fa3db342 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_credit.c
b/src/lib/testing_api_cmd_bank_history_credit.c
index bb86a9b4..85a67f9d 100644
--- a/src/lib/testing_api_cmd_bank_history_credit.c
+++ b/src/lib/testing_api_cmd_bank_history_credit.c
@@ -564,8 +564,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 start_row_reference reference to a command that can
* offer a row identifier, to be used as the starting row
* to accept in the result.
@@ -574,7 +572,6 @@ history_cleanup (void *cls,
*/
struct TALER_TESTING_Command
TALER_TESTING_cmd_bank_credits (const char *label,
- const char *account_url,
const struct
TALER_BANK_AuthenticationData *auth,
const char *start_row_reference,
@@ -583,7 +580,7 @@ TALER_TESTING_cmd_bank_credits (const char *label,
struct HistoryState *hs;
hs = GNUNET_new (struct HistoryState);
- hs->account_url = GNUNET_strdup (account_url);
+ hs->account_url = GNUNET_strdup (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_history_debit.c
b/src/lib/testing_api_cmd_bank_history_debit.c
index 6b06fcd9..671c79d3 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 db6b9e24..919946f6 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;
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (22bd615f -> 0cebe32f),
gnunet <=