[taler-exchange] 02/02: add separate transfer and admin/add/incoming commands, force

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

commit 85c4aa733c3862fbfd220bac2b69a95dda7cabc0
Merge: cbcc3727 2ee33e3c
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jan 12 00:43:24 2020 +0100

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

 src/bank-lib/test_bank_api.c                      | 24 +++++++++++------------
 src/bank-lib/testing_api_cmd_admin_add_incoming.c | 10 +++++-----
 src/benchmark/taler-exchange-benchmark.c          | 14 ++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --cc src/bank-lib/test_bank_api.c
index 5e7a3a33,d577bff9..1dd493bb
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@@ -78,26 -101,32 +78,26 @@@ 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,
 -                                         "subject 1"),
 -    TALER_TESTING_cmd_bank_history ("history-1c",
 -                                    bank_url,
 -                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
 -                                    TALER_BANK_DIRECTION_CREDIT,
 -                                    GNUNET_YES,
 -                                    NULL,
 -                                    5),
 -    TALER_TESTING_cmd_bank_history ("history-1d",
 -                                    bank_url,
 -                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
 -                                    TALER_BANK_DIRECTION_DEBIT,
 -                                    GNUNET_YES,
++                                         NULL),
 +    TALER_TESTING_cmd_bank_credits ("history-1c",
 +                                    account_url,
                                      NULL,
                                      5),
 -    TRANSFER ("debit-2",
 -              "KUDOS:3.21",
 -              TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
 -              TALER_TESTING_USER_ACCOUNT_NUMBER,
 -              "subject 2"),
 +    TALER_TESTING_cmd_bank_debits ("history-1d",
 +                                   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 --cc src/bank-lib/testing_api_cmd_admin_add_incoming.c
index b7b18374,4b81e9dc..4690928e
--- a/src/bank-lib/testing_api_cmd_admin_add_incoming.c
+++ b/src/bank-lib/testing_api_cmd_admin_add_incoming.c
@@@ -611,9 -625,9 +611,9 @@@ TALER_TESTING_cmd_fakebank_transfer_wit
   * @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 FakebankTransferState *fts;
 +  struct AdminAddIncomingState *fts;
  
    GNUNET_assert (&fakebank_transfer_run == cmd.run);
    fts = cmd.cls;

-- 
To stop receiving notification emails like this one, please contact
address@hidden.