test cases / logging

5 files changed, 26 insertions, 8 deletions

diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index 600ae536..ab300b35 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -357,8 +357,9 @@ history_cb (void *cls,
     if (TALER_EC_NONE != ec)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Error fetching history: %u!\n",
-                  (unsigned int) ec);
+                  "Error fetching history: ec=%u, http_status=%u\n",
+                  (unsigned int) ec,
+                  http_status);
     }
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "End of list. Committing progress!\n");
@@ -536,6 +537,10 @@ find_transfers (void *cls)
   delay = GNUNET_YES;
   current_batch_size = 0;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "wirewatch: requesting incoming history from %s\n",
+              wa_pos->auth.wire_gateway_url);
+
   hh = TALER_BANK_credit_history (ctx,
                                   wa_pos->auth.wire_gateway_url,
                                   &wa_pos->auth,
diff --git a/src/lib/test-taler-exchange-wirewatch-postgres.conf b/src/lib/test-taler-exchange-wirewatch-postgres.conf
index 36766ce1..ae5cd7ef 100644
--- a/src/lib/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/lib/test-taler-exchange-wirewatch-postgres.conf
@@ -28,7 +28,7 @@ BASE_URL = "http://localhost:8081/"
 # as constant in production.
 #
 # This is THE test that requires a short reserve expiration time!
-IDLE_RESERVE_EXPIRATION_TIME = 5 s
+IDLE_RESERVE_EXPIRATION_TIME = 4 s
 
 [exchangedb-postgres]
 #The connection string the plugin has to use for connecting to the database
@@ -46,7 +46,12 @@ PORT = 8083
 [account-1]
 
 # What is the account URL?
-URL = "payto://x-taler-bank/localhost:8082/2"
+URL = "payto://x-taler-bank/localhost/2"
+WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
 
 METHOD = x-taler-bank
 WIRE_RESPONSE = ${TALER_CONFIG_HOME}/account-1.json
@@ -55,6 +60,9 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 TALER_BANK_AUTH_METHOD = NONE
 
+[bank]
+HTTP_PORT = 8082
+
 [fees-x-taler-bank]
 
 # Fees for the forseeable future...
diff --git a/src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json b/src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json
index 3343f6c6..f39677ef 100644
--- a/src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json
+++ b/src/lib/test_taler_exchange_httpd_home/.config/taler/account-1.json
@@ -1,4 +1,4 @@
 {
-  "url": "payto://x-taler-bank/localhost:8082/2",
-  "master_sig": "2MNAYBN0Q5VEJKFBGH2SRJQSV3QXA81FPXMFF5Y5YQQW1MRTDGJTZX35XHMCZFZ9SN9Q4TQ6MNM8EX7GPPD2MP8Q528A1D8RK7N9J38"
+  "url": "payto://x-taler-bank/localhost/2",
+  "master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
 }
\ No newline at end of file
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 a5c8d684..761e6617 100644
--- a/src/lib/testing_api_cmd_bank_admin_add_incoming.c
+++ b/src/lib/testing_api_cmd_bank_admin_add_incoming.c
@@ -54,12 +54,12 @@ struct AdminAddIncomingState
   const char *exchange_credit_url;
 
   /**
-   * Money sender account URL.
+   * Money sender payto URL.
    */
   const char *payto_debit_account;
 
   /**
-   * Money sender account URL.
+   * Money receiver payto URL.
    */
   char *payto_credit_account;
 
diff --git a/src/lib/testing_api_cmd_bank_check.c b/src/lib/testing_api_cmd_bank_check.c
index 78526cdd..5c10e2a6 100644
--- a/src/lib/testing_api_cmd_bank_check.c
+++ b/src/lib/testing_api_cmd_bank_check.c
@@ -158,6 +158,11 @@ check_bank_transfer_run (void *cls,
               debit_payto,
               debit_account);
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "converted credit_payto (%s) to credit_account (%s)\n",
+              credit_payto,
+              credit_account);
+
   if (GNUNET_OK !=
       TALER_FAKEBANK_check_debit (is->fakebank,
                                   &amount,