-fix FTBFS for Taler protocol v11

1 files changed, 24 insertions, 23 deletions

diff --git a/src/reducer/anastasis_api_backup_redux.c b/src/reducer/anastasis_api_backup_redux.c
index fab5230..e300081 100644
--- a/src/reducer/anastasis_api_backup_redux.c
+++ b/src/reducer/anastasis_api_backup_redux.c
@@ -2455,12 +2455,12 @@ del_challenge (json_t *state,
  * @return number of years of service to pay for
 */
 static unsigned int
-expiration_to_years (struct GNUNET_TIME_Absolute expiration)
+expiration_to_years (struct GNUNET_TIME_Timestamp expiration)
 {
   struct GNUNET_TIME_Relative rem;
   unsigned int years;
 
-  rem = GNUNET_TIME_absolute_get_remaining (expiration);
+  rem = GNUNET_TIME_absolute_get_remaining (expiration.abs_time);
   years = rem.rel_value_us / GNUNET_TIME_UNIT_YEARS.rel_value_us;
   if (0 != rem.rel_value_us % GNUNET_TIME_UNIT_YEARS.rel_value_us)
     years++;
@@ -2480,7 +2480,7 @@ expiration_to_years (struct GNUNET_TIME_Absolute expiration)
  */
 static enum GNUNET_GenericReturnValue
 update_expiration_cost (json_t *state,
-                        struct GNUNET_TIME_Absolute expiration)
+                        struct GNUNET_TIME_Timestamp expiration)
 {
   struct Costs *costs = NULL;
   unsigned int years;
@@ -2695,13 +2695,12 @@ update_expiration_cost (json_t *state,
   }
 
   if (is_free)
-    expiration = GNUNET_TIME_relative_to_absolute (ANASTASIS_FREE_STORAGE);
+    expiration = GNUNET_TIME_relative_to_timestamp (ANASTASIS_FREE_STORAGE);
   /* update 'expiration' in state */
   {
     json_t *eo;
 
-    (void) GNUNET_TIME_round_abs (&expiration);
-    eo = GNUNET_JSON_from_time_abs (expiration);
+    eo = GNUNET_JSON_from_timestamp (expiration);
     GNUNET_assert (0 ==
                    json_object_set_new (state,
                                         "expiration",
@@ -2742,11 +2741,12 @@ done_policy_review (json_t *state,
     return NULL;
   }
   {
-    struct GNUNET_TIME_Absolute exp = {0};
+    struct GNUNET_TIME_Timestamp exp
+      = GNUNET_TIME_UNIT_ZERO_TS;
     struct GNUNET_JSON_Specification spec[] = {
       GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_absolute_time ("expiration",
-                                        &exp)),
+        GNUNET_JSON_spec_timestamp ("expiration",
+                                    &exp)),
       GNUNET_JSON_spec_end ()
     };
 
@@ -2761,8 +2761,8 @@ done_policy_review (json_t *state,
                              "invalid expiration specified");
       return NULL;
     }
-    if (0 == exp.abs_value_us)
-      exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_YEARS);
+    if (GNUNET_TIME_absolute_is_zero (exp.abs_time))
+      exp = GNUNET_TIME_relative_to_timestamp (GNUNET_TIME_UNIT_YEARS);
     if (GNUNET_OK !=
         update_expiration_cost (state,
                                 exp))
@@ -3054,8 +3054,8 @@ secret_share_result_cb (void *cls,
         d = GNUNET_JSON_PACK (
           GNUNET_JSON_pack_uint64 ("policy_version",
                                    pssi->policy_version),
-          GNUNET_JSON_pack_time_abs ("policy_expiration",
-                                     pssi->policy_expiration));
+          GNUNET_JSON_pack_timestamp ("policy_expiration",
+                                      pssi->policy_expiration));
         GNUNET_assert (NULL != d);
         GNUNET_assert (0 ==
                        json_object_set_new (sa,
@@ -3992,10 +3992,10 @@ upload (json_t *state,
   struct UploadContext *uc;
   json_t *auth_methods;
   json_t *policies;
-  struct GNUNET_TIME_Absolute expiration;
+  struct GNUNET_TIME_Timestamp expiration;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_absolute_time ("expiration",
-                                    &expiration),
+    GNUNET_JSON_spec_timestamp ("expiration",
+                                &expiration),
     GNUNET_JSON_spec_end ()
   };
 
@@ -4320,13 +4320,14 @@ enter_secret (json_t *state,
               void *cb_cls)
 {
   json_t *jsecret;
-  struct GNUNET_TIME_Absolute expiration = {0};
+  struct GNUNET_TIME_Timestamp expiration
+    = GNUNET_TIME_UNIT_ZERO_TS;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_json ("secret",
                            &jsecret),
     GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_absolute_time ("expiration",
-                                      &expiration)),
+      GNUNET_JSON_spec_timestamp ("expiration",
+                                  &expiration)),
     GNUNET_JSON_spec_end ()
   };
 
@@ -4374,7 +4375,7 @@ enter_secret (json_t *state,
       break;
     }
   }
-  if (0 != expiration.abs_value_us)
+  if (! GNUNET_TIME_absolute_is_zero (expiration.abs_time))
   {
     if (GNUNET_OK !=
         update_expiration_cost (state,
@@ -4505,10 +4506,10 @@ update_expiration (json_t *state,
                    ANASTASIS_ActionCallback cb,
                    void *cb_cls)
 {
-  struct GNUNET_TIME_Absolute expiration;
+  struct GNUNET_TIME_Timestamp expiration;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_absolute_time ("expiration",
-                                    &expiration),
+    GNUNET_JSON_spec_timestamp ("expiration",
+                                &expiration),
     GNUNET_JSON_spec_end ()
   };