summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-01-12 00:43:24 +0100
committerChristian Grothoff <christian@grothoff.org>2020-01-12 00:43:24 +0100
commit85c4aa733c3862fbfd220bac2b69a95dda7cabc0 (patch)
treed806bd14a377aa5e1a203f9c7a4071a9e61a56f2
parentcbcc3727de347a2426ad6616ef577f0138b7d7e9 (diff)
parent2ee33e3cbcc5432d9a017e8484a882635de6d6d5 (diff)
downloadexchange-85c4aa733c3862fbfd220bac2b69a95dda7cabc0.tar.gz
exchange-85c4aa733c3862fbfd220bac2b69a95dda7cabc0.tar.bz2
exchange-85c4aa733c3862fbfd220bac2b69a95dda7cabc0.zip
add separate transfer and admin/add/incoming commands, force
-rw-r--r--src/bank-lib/test_bank_api.c24
-rw-r--r--src/bank-lib/testing_api_cmd_admin_add_incoming.c10
-rw-r--r--src/benchmark/taler-exchange-benchmark.c14
3 files changed, 24 insertions, 24 deletions
diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c
index 5e7a3a33f..1dd493bb0 100644
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@ -78,12 +78,12 @@ run (void *cls,
account_url,
NULL,
1),
- TALER_TESTING_cmd_admin_add_incoming ("debit-1",
- "KUDOS:5.01",
- account_url,
- payto_url,
- NULL,
- NULL),
+ TALER_TESTING_cmd_fakebank_transfer ("debit-1",
+ "KUDOS:5.01",
+ account_url,
+ payto_url,
+ NULL,
+ NULL),
TALER_TESTING_cmd_bank_credits ("history-1c",
account_url,
NULL,
@@ -92,12 +92,12 @@ run (void *cls,
account_url,
NULL,
5),
- TALER_TESTING_cmd_admin_add_incoming ("debit-2",
- "KUDOS:3.21",
- account_url,
- payto_url,
- NULL,
- NULL),
+ TALER_TESTING_cmd_fakebank_transfer ("debit-2",
+ "KUDOS:3.21",
+ account_url,
+ payto_url,
+ NULL,
+ NULL),
TRANSFER ("credit-2",
"KUDOS:3.22",
TALER_TESTING_USER_ACCOUNT_NUMBER,
diff --git a/src/bank-lib/testing_api_cmd_admin_add_incoming.c b/src/bank-lib/testing_api_cmd_admin_add_incoming.c
index b7b18374a..4690928e9 100644
--- a/src/bank-lib/testing_api_cmd_admin_add_incoming.c
+++ b/src/bank-lib/testing_api_cmd_admin_add_incoming.c
@@ -120,7 +120,7 @@ struct AdminAddIncomingState
/**
* Was this command modified via
- * #TALER_TESTING_cmd_admin_add_incoming_with_retry to
+ * #TALER_TESTING_cmd_fakebank_transfer_with_retry to
* enable retries?
*/
int do_retry;
@@ -435,7 +435,7 @@ fakebank_transfer_traits (void *cls,
* @return the command.
*/
struct TALER_TESTING_Command
-TALER_TESTING_cmd_admin_add_incoming
+TALER_TESTING_cmd_fakebank_transfer
(const char *label,
const char *amount,
const char *account_base_url,
@@ -494,7 +494,7 @@ TALER_TESTING_cmd_admin_add_incoming
* @return the 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 *amount,
const char *account_base_url,
@@ -561,7 +561,7 @@ TALER_TESTING_cmd_admin_add_incoming_with_ref
* @return the 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 *amount,
const char *account_base_url,
@@ -611,7 +611,7 @@ TALER_TESTING_cmd_admin_add_incoming_with_instance
* @return the command with retries enabled
*/
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;
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index eff8f5c44..3f687f00e 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -59,13 +59,13 @@ enum BenchmarkError
#define FIRST_INSTRUCTION -1
#define CMD_TRANSFER_TO_EXCHANGE(label, amount) \
- TALER_TESTING_cmd_admin_add_incoming_retry \
- (TALER_TESTING_cmd_admin_add_incoming (label, amount, \
- user_bank_account.details. \
- x_taler_bank.account_base_url, \
- exchange_payto_url, \
- "dummy_user", \
- "dummy_password"))
+ TALER_TESTING_cmd_fakebank_transfer_retry \
+ (TALER_TESTING_cmd_fakebank_transfer (label, amount, \
+ user_bank_account.details. \
+ x_taler_bank.account_base_url, \
+ exchange_payto_url, \
+ "dummy_user", \
+ "dummy_password"))
/**