anastasis

commit f7742d1a5ac891f0fc2cb162d8c94daa37eb9fd2
parent 8ce939cad97b049699b6779cc5902e8cf5c2bf41
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 17 Jan 2023 20:04:58 +0100

-fix Taler v0.9.x compatibility issues in test

Diffstat:
M
src/backend/anastasis-httpd_truth-upload.c
 | 
1
-
M
src/cli/test_anastasis_reducer_enter_secret.sh
 | 
12
++++++------
M
src/restclient/anastasis_api_truth_store.c
 | 
10
+++++++++-

3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/backend/anastasis-httpd_truth-upload.c b/src/backend/anastasis-httpd_truth-upload.c
@@ -415,7 +415,6 @@ check_payment_cb (void *cls,
                          "description", "challenge storage fee",
                          "quantity", (json_int_t) tuc->years_to_pay,
                          "unit", "years",
-
                          "order_id",
                          order_id);
       GNUNET_free (order_id);
diff --git a/src/cli/test_anastasis_reducer_enter_secret.sh b/src/cli/test_anastasis_reducer_enter_secret.sh
@@ -213,7 +213,7 @@ taler-exchange-offline -c $CONF \
   sign \
   enable-account payto://x-taler-bank/localhost/Exchange \
   enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \
-  wire-fee now x-taler-bank TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 \
+  wire-fee now x-taler-bank TESTKUDOS:0.01 TESTKUDOS:0.01 \
   upload &> taler-exchange-offline.log
 
 echo -n "."
@@ -268,7 +268,7 @@ echo "OK"
 echo -n "Configuring merchant instance ..."
 # Setup merchant
 
-curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/management/instances
+curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' http://localhost:9966/management/instances
 
 
 echo " DONE"
@@ -289,14 +289,14 @@ fi
 echo " DONE"
 echo -en $COLOR$BOLD"Test expiration change ..."$NORM$NOCOLOR
 
-MILLIS=`date '+%s'`000
+SECS=`date '+%s'`
 # Use 156 days into the future to get 1 year
-MILLIS=`expr $MILLIS + 13478400000`
+SECS=`expr $SECS + 13478400`
 
 $PREFIX anastasis-reducer -a \
   "$(jq -n '
-   {"expiration": { "t_ms" : $MSEC } }' \
-   --argjson MSEC $MILLIS
+   {"expiration": { "t_s" : $SEC } }' \
+   --argjson SEC $SECS
   )" \
   update_expiration $TFILE $UFILE
 
diff --git a/src/restclient/anastasis_api_truth_store.c b/src/restclient/anastasis_api_truth_store.c
@@ -169,10 +169,18 @@ handle_truth_store_finished (void *cls,
     ud.ec = TALER_JSON_get_error_code2 (data,
                                         data_size);
     break;
+  case MHD_HTTP_BAD_GATEWAY:
+    ud.ec = TALER_JSON_get_error_code2 (data,
+                                        data_size);
+    break;
   default:
-    GNUNET_break (0);
     ud.ec = TALER_JSON_get_error_code2 (data,
                                         data_size);
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected HTTP status code %u/%d\n",
+                (unsigned int) response_code,
+                ud.ec);
     break;
   }
   tso->cb (tso->cb_cls,