merchant

commit 06bedbd038b73832f2cbf77a8238a9b05cd3d42f
parent d3178f2e4b5c60aa7463a8cb07ed3087859a1c83
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Thu, 21 Jul 2022 15:05:29 +0200

-fix tests

Diffstat:
M
src/testing/Makefile.am
 | 
1
+
M
src/testing/test_merchant_order_creation.sh
 | 
8
++++----
M
src/testing/test_merchant_transfer_tracking.sh
 | 
6
+++---

3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
@@ -9,6 +9,7 @@ endif
 
 check_SCRIPTS = \
   test-merchant-walletharness.sh \
+  test_merchant_instance_auth.sh \
   test_merchant_instance_response.sh \
   test_merchant_instance_purge.sh \
   test_merchant_reserve_creation.sh \
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
@@ -247,7 +247,7 @@ echo "OK"
 
 
 STATUS=$(curl 'http://localhost:9966/instances/default/private/products' \
-    -d '{"product_id":"1","description":"product with id 1 and price :15","price":"USD:15","total_stock":1,"description_i18n":{},"unit":"","image":"","taxes":[],"address":{},"next_restock":{"t_ms":"never"}}' \
+    -d '{"product_id":"1","description":"product with id 1 and price :15","price":"USD:15","total_stock":1,"description_i18n":{},"unit":"","image":"","taxes":[],"address":{},"next_restock":{"t_s":"never"}}' \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "400" ]
@@ -315,12 +315,12 @@ fi
 # WIRE TRANSFER TO MERCHANT AND NOTIFY BACKEND
 #
 
-PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_ms < $LAST_RESPONSE`
-WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_ms < $LAST_RESPONSE`
+PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_s < $LAST_RESPONSE`
+WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_s < $LAST_RESPONSE`
 
 NOW=`date +%s`
 
-TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))`
+TO_SLEEP=`echo $(( $WIRE_DEADLINE - $NOW ))`
 echo waiting $TO_SLEEP secs for wire transfer
 
 echo -n "Perform wire transfers ..."
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
@@ -128,12 +128,12 @@ fi
 # WIRE TRANSFER TO MERCHANT AND NOTIFY BACKEND
 #
 
-PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_ms < $LAST_RESPONSE`
-WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_ms < $LAST_RESPONSE`
+PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_s < $LAST_RESPONSE`
+WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_s < $LAST_RESPONSE`
 
 NOW=`date +%s`
 
-TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))`
+TO_SLEEP=`echo $(( $WIRE_DEADLINE - $NOW ))`
 echo "waiting $TO_SLEEP secs for wire transfer"
 
 echo -n "Perform wire transfers ..."