migration to protocol v11

1 files changed, 11 insertions, 9 deletions

diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
index 2f98be98..fe120212 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-refund.c
@@ -156,8 +156,8 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
     enum GNUNET_DB_QueryStatus qs;
     json_t *contract_terms;
     uint64_t order_serial;
-    struct GNUNET_TIME_Absolute refund_deadline;
-    struct GNUNET_TIME_Absolute timestamp;
+    struct GNUNET_TIME_Timestamp refund_deadline;
+    struct GNUNET_TIME_Timestamp timestamp;
 
     qs = TMH_db->lookup_contract_terms (TMH_db->cls,
                                         hc->instance->settings.id,
@@ -168,10 +168,10 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
     if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
     {
       struct GNUNET_JSON_Specification spec[] = {
-        TALER_JSON_spec_absolute_time ("refund_deadline",
-                                       &refund_deadline),
-        TALER_JSON_spec_absolute_time ("timestamp",
-                                       &timestamp),
+        GNUNET_JSON_spec_timestamp ("refund_deadline",
+                                    &refund_deadline),
+        GNUNET_JSON_spec_timestamp ("timestamp",
+                                    &timestamp),
         GNUNET_JSON_spec_end ()
       };
 
@@ -190,7 +190,9 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
           "mandatory fields missing");
       }
       json_decref (contract_terms);
-      if (timestamp.abs_value_us == refund_deadline.abs_value_us)
+      if (GNUNET_TIME_timestamp_cmp (timestamp,
+                                     ==,
+                                     refund_deadline))
       {
         /* refund was never allowed, so we should refuse hard */
         return TALER_MHD_reply_with_error (
@@ -199,7 +201,7 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
           TALER_EC_MERCHANT_PRIVATE_POST_ORDERS_ID_REFUND_NOT_ALLOWED_BY_CONTRACT,
           NULL);
       }
-      if (GNUNET_TIME_absolute_is_past (refund_deadline))
+      if (GNUNET_TIME_absolute_is_past (refund_deadline.abs_time))
       {
         /* it is too late for refunds */
         /* NOTE: We MAY still be lucky that the exchange did not yet
@@ -335,7 +337,7 @@ TMH_private_post_orders_ID_refund (const struct TMH_RequestHandler *rh,
   }
 
   {
-    struct GNUNET_TIME_Absolute timestamp;
+    struct GNUNET_TIME_Timestamp timestamp;
     uint64_t order_serial;
     enum GNUNET_DB_QueryStatus qs;