merchant

commit febe091ebf193939f1e94ff4b21504f5a5d41bb3
parent fd22e4c75dd2cad7f2ff0a55660e9af057419e5b
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 16 Jul 2023 15:03:22 +0200

-fail if transfer is not found, instead of hanging

Diffstat:
M
src/merchant-tools/benchmark-common.conf
 | 
8
+++-----
A
src/merchant-tools/exchange_benchmark_home/taler/exchange/offline-keys/master.priv
 | 
2
++
M
src/testing/testing_api_cmd_post_transfers.c
 | 
12
+++++++++---

3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/merchant-tools/benchmark-common.conf b/src/merchant-tools/benchmark-common.conf
@@ -13,10 +13,10 @@ MERCHANT_URL = "http://localhost:9966/"
 AML_THRESHOLD=EUR:99999999
 SIGNKEY_LEGAL_DURATION=2 years
 PORT=8081
-MASTER_PUBLIC_KEY=98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+MASTER_PUBLIC_KEY=MN7KME8DKVVXFSX7H2VTG7YGRFWFJV37KHJG7FEBFKMEDP73V3VG
 DB=postgres
 BASE_URL="http://localhost:8081/"
-AGGREGATOR_SHARD_SIZE=67108864
+# AGGREGATOR_SHARD_SIZE=67108864
 WIREWATCH_IDLE_SLEEP_INTERVAL=5 ms
 
 [exchangedb-postgres]
@@ -61,9 +61,7 @@ WIRE_GATEWAY_URL = "http://localhost:8082/facades/test-facade/taler-wire-gateway
 # Trust local exchange for "EUR" currency
 [merchant-exchange-benchmark]
 EXCHANGE_BASE_URL = http://localhost:8081/
-MASTER_KEY=98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# If currency does not match [TALER] section, the exchange
-# will be ignored!
+MASTER_KEY=MN7KME8DKVVXFSX7H2VTG7YGRFWFJV37KHJG7FEBFKMEDP73V3VG
 CURRENCY = EUR
 
 
diff --git a/src/merchant-tools/exchange_benchmark_home/taler/exchange/offline-keys/master.priv b/src/merchant-tools/exchange_benchmark_home/taler/exchange/offline-keys/master.priv
@@ -0,0 +1 @@
+-�ڟ��|�Fl�#L	��ruMo�|�,p]
+\ No newline at end of file
diff --git a/src/testing/testing_api_cmd_post_transfers.c b/src/testing/testing_api_cmd_post_transfers.c
@@ -236,13 +236,13 @@ debit_cb (
   pts->dhh = NULL;
   switch (reply->http_status)
   {
+  case MHD_HTTP_OK:
+    /* handled below */
+    break;
   case MHD_HTTP_NO_CONTENT:
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (pts->is);
     return;
-  case MHD_HTTP_OK:
-    /* handled below */
-    break;
   default:
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (pts->is);
@@ -282,6 +282,12 @@ debit_cb (
     GNUNET_assert (NULL != pts->pth);
     break;
   }
+  if (NULL == pts->pth)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (pts->is);
+    return;
+  }
 }