[taler-merchant] branch master updated: -fix non-deterministic failure if no refund deadline given

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 9a651aee -fix non-deterministic failure if no refund deadline given
9a651aee is described below

commit 9a651aeea9cf20233a9488e45ddd11bba5f3ea68
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Feb 1 10:44:56 2023 +0100

    -fix non-deterministic failure if no refund deadline given
---
 src/backend/taler-merchant-httpd_private-post-orders.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c 
b/src/backend/taler-merchant-httpd_private-post-orders.c
index ad458cf4..a10058e9 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -916,18 +916,17 @@ patch_order (struct MHD_Connection *connection,
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                     "Refund delay is zero, no refunds are possible for this 
order\n");
-        refund_deadline = now; /* if delay was 0, ensure that refund_deadline 
== timestamp */
+        refund_deadline = GNUNET_TIME_UNIT_ZERO_TS;
       }
       else
       {
         refund_deadline = GNUNET_TIME_relative_to_timestamp (refund_delay);
+        GNUNET_assert (0 ==
+                       json_object_set_new (order,
+                                            "refund_deadline",
+                                            GNUNET_JSON_from_timestamp (
+                                              refund_deadline)));
       }
-
-      GNUNET_assert (0 ==
-                     json_object_set_new (order,
-                                          "refund_deadline",
-                                          GNUNET_JSON_from_timestamp (
-                                            refund_deadline)));
     }
     if ( (! GNUNET_TIME_absolute_is_zero (delivery_date.abs_time)) &&
          (GNUNET_TIME_absolute_is_past (delivery_date.abs_time)) )

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.