taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add separate transfer and admin/add/incoming commands, force

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-12 00:43:24 +01:00
commit 85c4aa733c
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bank-lib/test_bank_api.c
View File

@ -78,12 +78,12 @@ run (void *cls,
account_url, account_url,
NULL, NULL,
1), 1),
TALER_TESTING_cmd_admin_add_incoming ("debit-1", TALER_TESTING_cmd_fakebank_transfer ("debit-1",
"KUDOS:5.01", "KUDOS:5.01",
account_url, account_url,
payto_url, payto_url,
NULL, NULL,
NULL), NULL),
TALER_TESTING_cmd_bank_credits ("history-1c", TALER_TESTING_cmd_bank_credits ("history-1c",
account_url, account_url,
NULL, NULL,
@ -92,12 +92,12 @@ run (void *cls,
account_url, account_url,
NULL, NULL,
5), 5),
TALER_TESTING_cmd_admin_add_incoming ("debit-2", TALER_TESTING_cmd_fakebank_transfer ("debit-2",
"KUDOS:3.21", "KUDOS:3.21",
account_url, account_url,
payto_url, payto_url,
NULL, NULL,
NULL), NULL),
TRANSFER ("credit-2", TRANSFER ("credit-2",
"KUDOS:3.22", "KUDOS:3.22",
TALER_TESTING_USER_ACCOUNT_NUMBER, TALER_TESTING_USER_ACCOUNT_NUMBER,

10
src/bank-lib/testing_api_cmd_admin_add_incoming.c
View File

@ -120,7 +120,7 @@ struct AdminAddIncomingState
/** /**
* Was this command modified via * Was this command modified via
* #TALER_TESTING_cmd_admin_add_incoming_with_retry to * #TALER_TESTING_cmd_fakebank_transfer_with_retry to
* enable retries? * enable retries?
*/ */
int do_retry; int do_retry;
@ -435,7 +435,7 @@ fakebank_transfer_traits (void *cls,
* @return the command. * @return the command.
*/ */
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming TALER_TESTING_cmd_fakebank_transfer
(const char *label, (const char *label,
const char *amount, const char *amount,
const char *account_base_url, const char *account_base_url,
@ -494,7 +494,7 @@ TALER_TESTING_cmd_admin_add_incoming
* @return the command. * @return the command.
*/ */
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming_with_ref TALER_TESTING_cmd_fakebank_transfer_with_ref
(const char *label, (const char *label,
const char *amount, const char *amount,
const char *account_base_url, const char *account_base_url,
@ -561,7 +561,7 @@ TALER_TESTING_cmd_admin_add_incoming_with_ref
* @return the command. * @return the command.
*/ */
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming_with_instance TALER_TESTING_cmd_fakebank_transfer_with_instance
(const char *label, (const char *label,
const char *amount, const char *amount,
const char *account_base_url, const char *account_base_url,
@ -611,7 +611,7 @@ TALER_TESTING_cmd_admin_add_incoming_with_instance
* @return the command with retries enabled * @return the command with retries enabled
*/ */
struct TALER_TESTING_Command struct TALER_TESTING_Command
TALER_TESTING_cmd_admin_add_incoming_retry (struct TALER_TESTING_Command cmd) TALER_TESTING_cmd_fakebank_transfer_retry (struct TALER_TESTING_Command cmd)
{ {
struct AdminAddIncomingState *fts; struct AdminAddIncomingState *fts;

14
src/benchmark/taler-exchange-benchmark.c
View File

@ -59,13 +59,13 @@ enum BenchmarkError
#define FIRST_INSTRUCTION -1 #define FIRST_INSTRUCTION -1
#define CMD_TRANSFER_TO_EXCHANGE(label, amount) \ #define CMD_TRANSFER_TO_EXCHANGE(label, amount) \
TALER_TESTING_cmd_admin_add_incoming_retry \ TALER_TESTING_cmd_fakebank_transfer_retry \
(TALER_TESTING_cmd_admin_add_incoming (label, amount, \ (TALER_TESTING_cmd_fakebank_transfer (label, amount, \
user_bank_account.details. \ user_bank_account.details. \
x_taler_bank.account_base_url, \ x_taler_bank.account_base_url, \
exchange_payto_url, \ exchange_payto_url, \
"dummy_user", \ "dummy_user", \
"dummy_password")) "dummy_password"))
/** /**