-misc fixes

5 files changed, 18 insertions, 8 deletions

diff --git a/src/benchmark/bank-benchmark-cs.conf b/src/benchmark/bank-benchmark-cs.conf
index d012f0faa..e32370f89 100644
--- a/src/benchmark/bank-benchmark-cs.conf
+++ b/src/benchmark/bank-benchmark-cs.conf
@@ -28,7 +28,7 @@ DB = postgres
 # exchange (or the twister) is actually listening.
 base_url = "http://localhost:8081/"
 
-WIREWATCH_IDLE_SLEEP_INTERVAL = 1500 ms
+WIREWATCH_IDLE_SLEEP_INTERVAL = 500 ms
 
 [exchange-offline]
 MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
@@ -51,11 +51,11 @@ MAX_DEBT = EUR:100000000000.0
 MAX_DEBT_BANK = EUR:1000000000000000.0
 
 [benchmark]
-USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
+USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42?receiver-name=user42
 
 [exchange-account-2]
 # What is the payto://-URL of the exchange (to generate wire response)
-PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange"
+PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange?receiver-name=Exchange"
 enable_debit = YES
 enable_credit = YES
 
diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c
index b17bb9411..584df4896 100644
--- a/src/benchmark/taler-bank-benchmark.c
+++ b/src/benchmark/taler-bank-benchmark.c
@@ -689,6 +689,8 @@ parallel_benchmark (void)
       }
 
       /* But be extra sure we did finish all shards by doing one more */
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Shard check phase\n");
       wirewatch[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
                                               NULL, NULL, NULL,
                                               "taler-exchange-wirewatch",
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index 77ef94ebc..fd7553813 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014-2020 Taler Systems SA
+  (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it
   under the terms of the GNU Affero General Public License as
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index 9f954c27f..2bffc3b85 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -482,6 +482,10 @@ transaction_completed (void)
     latency = GNUNET_TIME_absolute_get_duration (hh_start_time);
     left = GNUNET_TIME_relative_subtract (longpoll_timeout,
                                           latency);
+#if 1
+    left = GNUNET_TIME_relative_min (left,
+                                     GNUNET_TIME_UNIT_SECONDS);
+#endif
     delayed_until = GNUNET_TIME_relative_to_absolute (left);
   }
   if (test_mode)
@@ -857,6 +861,10 @@ lock_shard (void *cls)
                   job_name,
                   GNUNET_STRINGS_relative_time_to_string (rdelay,
                                                           true));
+#if 1
+      rdelay = GNUNET_TIME_relative_min (rdelay,
+                                         GNUNET_TIME_UNIT_SECONDS);
+#endif
       delayed_until = GNUNET_TIME_relative_to_absolute (rdelay);
     }
     GNUNET_assert (NULL == task);
@@ -869,7 +877,7 @@ lock_shard (void *cls)
                 job_name,
                 GNUNET_STRINGS_relative_time_to_string (
                   wirewatch_idle_sleep_interval,
-                  GNUNET_YES));
+                  true));
     delayed_until = GNUNET_TIME_relative_to_absolute (
       wirewatch_idle_sleep_interval);
     shard_open = false;
diff --git a/src/exchangedb/exchange_do_reserves_in_insert.sql b/src/exchangedb/exchange_do_reserves_in_insert.sql
index 77672f012..07ce3ec28 100644
--- a/src/exchangedb/exchange_do_reserves_in_insert.sql
+++ b/src/exchangedb/exchange_do_reserves_in_insert.sql
@@ -286,8 +286,8 @@ BEGIN
             EXECUTE FORMAT (
               'NOTIFY %s'
               ,in1_notify);
-            EXIT loop_transaction;
           END IF;
+          EXIT loop_transaction;
       END CASE;
     END LOOP loop2_k;
   END LOOP loop_transaction;
@@ -564,8 +564,8 @@ BEGIN
             EXECUTE FORMAT (
               'NOTIFY %s'
               ,in3_notify);
-            EXIT loop_transaction;
           END IF;
+          EXIT loop_transaction;
       END CASE;
     END LOOP loop2_k;
   END LOOP loop_transaction;
@@ -1046,8 +1046,8 @@ BEGIN
             EXECUTE FORMAT (
               'NOTIFY %s'
               ,in7_notify);
-            EXIT loop_transaction;
           END IF;
+          EXIT loop_transaction;
       END CASE;
     END LOOP loop2_k;
   END LOOP loop_transaction;