From e0cf954ad9ab0c1613ab2c0f06ada581dbdb8276 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 23 Dec 2019 11:47:16 +0100
Subject: make exchange test suite work with current bank

---
 src/bank-lib/test_bank_api.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/bank-lib/test_bank_api.c')

diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c
index a7b6aef7e..d15984a9c 100644
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@ -92,7 +92,7 @@ run (void *cls,
   struct TALER_TESTING_Command commands[] = {
     TALER_TESTING_cmd_bank_history ("history-0",
                                     bank_url,
-                                    BANK_ACCOUNT_NUMBER,
+                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_BOTH,
                                     GNUNET_YES,
                                     NULL,
@@ -101,65 +101,65 @@ run (void *cls,
      * the parameters, although it was always set as '200 OK' */
     TRANSFER ("debit-1",
               "KUDOS:5.01",
-              EXCHANGE_ACCOUNT_NUMBER,
-              BANK_ACCOUNT_NUMBER,
+              TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
+              TALER_TESTING_BANK_ACCOUNT_NUMBER,
               "subject 1"),
     TALER_TESTING_cmd_bank_history ("history-1c",
                                     bank_url,
-                                    BANK_ACCOUNT_NUMBER,
+                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_CREDIT,
                                     GNUNET_YES,
                                     NULL,
                                     5),
     TALER_TESTING_cmd_bank_history ("history-1d",
                                     bank_url,
-                                    BANK_ACCOUNT_NUMBER,
+                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_DEBIT,
                                     GNUNET_YES,
                                     NULL,
                                     5),
     TRANSFER ("debit-2",
               "KUDOS:3.21",
-              EXCHANGE_ACCOUNT_NUMBER,
-              USER_ACCOUNT_NUMBER,
+              TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
+              TALER_TESTING_USER_ACCOUNT_NUMBER,
               "subject 2"),
     TRANSFER ("credit-2",
               "KUDOS:3.22",
-              USER_ACCOUNT_NUMBER,
-              EXCHANGE_ACCOUNT_NUMBER,
+              TALER_TESTING_USER_ACCOUNT_NUMBER,
+              TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
               "credit 2"),
     TALER_TESTING_cmd_bank_history ("history-2b",
                                     bank_url,
-                                    EXCHANGE_ACCOUNT_NUMBER,
+                                    TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_BOTH,
                                     GNUNET_YES,
                                     NULL,
                                     5),
     TALER_TESTING_cmd_bank_history ("history-2bi",
                                     bank_url,
-                                    EXCHANGE_ACCOUNT_NUMBER,
+                                    TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_BOTH,
                                     GNUNET_YES,
                                     "debit-1",
                                     5),
     TRANSFER ("credit-for-reject-1",
               "KUDOS:1.01",
-              BANK_ACCOUNT_NUMBER,
-              EXCHANGE_ACCOUNT_NUMBER,
+              TALER_TESTING_BANK_ACCOUNT_NUMBER,
+              TALER_TESTING_EXCHANGE_ACCOUNT_NUMBER,
               "subject 3"),
     TALER_TESTING_cmd_bank_reject ("reject-1",
                                    bank_url,
                                    "credit-for-reject-1"),
     TALER_TESTING_cmd_bank_history ("history-r1",
                                     bank_url,
-                                    BANK_ACCOUNT_NUMBER,
+                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_BOTH,
                                     GNUNET_YES,
                                     NULL,
                                     5),
     TALER_TESTING_cmd_bank_history ("history-r1c",
                                     bank_url,
-                                    BANK_ACCOUNT_NUMBER,
+                                    TALER_TESTING_BANK_ACCOUNT_NUMBER,
                                     TALER_BANK_DIRECTION_BOTH
                                     | TALER_BANK_DIRECTION_CANCEL,
                                     GNUNET_YES,
@@ -187,7 +187,7 @@ main (int argc,
   /* These environment variables get in the way... */
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup ("test-bank-api-with-(fake)bank-new",
+  GNUNET_log_setup ("test-bank-api",
                     "DEBUG",
                     NULL);
 
-- 
cgit v1.2.3