1 files changed, 35 insertions, 35 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 19e59812..3925011a 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -233,7 +233,7 @@ struct TALER_MERCHANTDB_ProductDetails
    * Identifies when the product will be restocked. 0 for unknown,
    * #GNUNET_TIME_UNIT_FOREVER_ABS for never.
    */
-  struct GNUNET_TIME_Absolute next_restock;
+  struct GNUNET_TIME_Timestamp next_restock;
 };
 
 
@@ -260,7 +260,7 @@ struct TALER_MERCHANTDB_OrderFilter
   /**
    * Filter orders by date, exact meaning depends on @e delta.
    */
-  struct GNUNET_TIME_Absolute date;
+  struct GNUNET_TIME_Timestamp date;
 
   /**
    * Filter orders by order serial number, exact meaning depends on @e delta.
@@ -293,7 +293,7 @@ typedef void
 (*TALER_MERCHANTDB_OrdersCallback)(void *cls,
                                    const char *order_id,
                                    uint64_t order_serial,
-                                   struct GNUNET_TIME_Absolute timestamp);
+                                   struct GNUNET_TIME_Timestamp timestamp);
 
 
 /**
@@ -349,7 +349,7 @@ typedef void
   void *cls,
   const struct TALER_WireTransferIdentifierRawP *wtid,
   const char *exchange_url,
-  struct GNUNET_TIME_Absolute execution_time,
+  struct GNUNET_TIME_Timestamp execution_time,
   const struct TALER_Amount *deposit_value,
   const struct TALER_Amount *deposit_fee,
   bool transfer_confirmed);
@@ -372,7 +372,7 @@ typedef void
 (*TALER_MERCHANTDB_RefundDetailCallback)(
   void *cls,
   uint64_t refund_serial,
-  struct GNUNET_TIME_Absolute timestamp,
+  struct GNUNET_TIME_Timestamp timestamp,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const char *exchange_url,
   uint64_t rtransaction_id,
@@ -400,7 +400,7 @@ typedef void
   uint64_t exchange_kyc_serial,
   const char *payto_uri,
   const char *exchange_url,
-  struct GNUNET_TIME_Absolute last_check,
+  struct GNUNET_TIME_Timestamp last_check,
   bool kyc_ok);
 
 
@@ -493,7 +493,7 @@ typedef void
   const char *payto_uri,
   const char *exchange_url,
   uint64_t transfer_serial_id,
-  struct GNUNET_TIME_Absolute execution_time,
+  struct GNUNET_TIME_Timestamp execution_time,
   bool verified,
   bool confirmed);
 
@@ -517,8 +517,8 @@ typedef void
 (*TALER_MERCHANTDB_ReservesCallback)(
   void *cls,
   const struct TALER_ReservePublicKeyP *reserve_pub,
-  struct GNUNET_TIME_Absolute creation_time,
-  struct GNUNET_TIME_Absolute expiration_time,
+  struct GNUNET_TIME_Timestamp creation_time,
+  struct GNUNET_TIME_Timestamp expiration_time,
   const struct TALER_Amount *merchant_initial_amount,
   const struct TALER_Amount *exchange_initial_amount,
   const struct TALER_Amount *pickup_amount,
@@ -609,8 +609,8 @@ typedef void
 typedef void
 (*TALER_MERCHANTDB_ReserveDetailsCallback)(
   void *cls,
-  struct GNUNET_TIME_Absolute creation_time,
-  struct GNUNET_TIME_Absolute expiration_time,
+  struct GNUNET_TIME_Timestamp creation_time,
+  struct GNUNET_TIME_Timestamp expiration_time,
   const struct TALER_Amount *merchant_initial_amount,
   const struct TALER_Amount *exchange_initial_amount,
   const struct TALER_Amount *picked_up_amount,
@@ -661,8 +661,8 @@ typedef void
   const struct TALER_Amount *refund_fee,
   const struct TALER_Amount *wire_fee,
   const struct TALER_MerchantWireHash *h_wire,
-  struct GNUNET_TIME_Absolute deposit_timestamp,
-  struct GNUNET_TIME_Absolute refund_deadline,
+  struct GNUNET_TIME_Timestamp deposit_timestamp,
+  struct GNUNET_TIME_Timestamp refund_deadline,
   const struct TALER_ExchangeSignatureP *exchange_sig,
   const struct TALER_ExchangePublicKeyP *exchange_pub);
 
@@ -1027,7 +1027,7 @@ struct TALER_MERCHANTDB_Plugin
                             uint64_t exchange_kyc_serial,
                             const struct TALER_ExchangeSignatureP *exchange_sig,
                             const struct TALER_ExchangePublicKeyP *exchange_pub,
-                            struct GNUNET_TIME_Absolute timestamp,
+                            struct GNUNET_TIME_Timestamp timestamp,
                             bool kyc_ok);
 
 
@@ -1136,7 +1136,7 @@ struct TALER_MERCHANTDB_Plugin
                   const char *product_id,
                   const struct GNUNET_Uuid *uuid,
                   uint64_t quantity,
-                  struct GNUNET_TIME_Absolute expiration_time);
+                  struct GNUNET_TIME_Timestamp expiration_time);
 
 
   /**
@@ -1202,7 +1202,7 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_order_summary)(void *cls,
                           const char *instance_id,
                           const char *order_id,
-                          struct GNUNET_TIME_Absolute *timestamp,
+                          struct GNUNET_TIME_Timestamp *timestamp,
                           uint64_t *order_serial);
 
 
@@ -1241,7 +1241,7 @@ struct TALER_MERCHANTDB_Plugin
                   const char *instance_id,
                   const char *order_id,
                   const struct GNUNET_HashCode *h_post_data,
-                  struct GNUNET_TIME_Absolute pay_deadline,
+                  struct GNUNET_TIME_Timestamp pay_deadline,
                   const struct TALER_ClaimTokenP *claim_token,
                   const json_t *contract_terms);
 
@@ -1400,9 +1400,9 @@ struct TALER_MERCHANTDB_Plugin
     void *cls,
     const struct TALER_MasterPublicKeyP *master_pub,
     const struct TALER_ExchangePublicKeyP *exchange_pub,
-    struct GNUNET_TIME_Absolute start_date,
-    struct GNUNET_TIME_Absolute expire_date,
-    struct GNUNET_TIME_Absolute end_date,
+    struct GNUNET_TIME_Timestamp start_date,
+    struct GNUNET_TIME_Timestamp expire_date,
+    struct GNUNET_TIME_Timestamp end_date,
     const struct TALER_MasterSignatureP *master_sig);
 
 
@@ -1426,7 +1426,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*insert_deposit)(void *cls,
                     const char *instance_id,
-                    struct GNUNET_TIME_Absolute deposit_timestamp,
+                    struct GNUNET_TIME_Timestamp deposit_timestamp,
                     const struct TALER_PrivateContractHash *h_contract_terms,
                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
                     const char *exchange_url,
@@ -1495,7 +1495,7 @@ struct TALER_MERCHANTDB_Plugin
   (*refund_coin)(void *cls,
                  const char *instance_id,
                  const struct TALER_PrivateContractHash *h_contract_terms,
-                 struct GNUNET_TIME_Absolute refund_timestamp,
+                 struct GNUNET_TIME_Timestamp refund_timestamp,
                  const struct TALER_CoinSpendPublicKeyP *coin_pub,
                  const char *reason);
 
@@ -1828,11 +1828,11 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_wire_fee)(void *cls,
                      const struct TALER_MasterPublicKeyP *master_pub,
                      const char *wire_method,
-                     struct GNUNET_TIME_Absolute contract_date,
+                     struct GNUNET_TIME_Timestamp contract_date,
                      struct TALER_Amount *wire_fee,
                      struct TALER_Amount *closing_fee,
-                     struct GNUNET_TIME_Absolute *start_date,
-                     struct GNUNET_TIME_Absolute *end_date,
+                     struct GNUNET_TIME_Timestamp *start_date,
+                     struct GNUNET_TIME_Timestamp *end_date,
                      struct TALER_MasterSignatureP *master_sig);
 
 
@@ -1885,7 +1885,7 @@ struct TALER_MERCHANTDB_Plugin
     struct TALER_Amount *total_amount,
     struct TALER_Amount *wire_fee,
     struct TALER_Amount *exchange_amount,
-    struct GNUNET_TIME_Absolute *execution_time,
+    struct GNUNET_TIME_Timestamp *execution_time,
     bool *have_exchange_sig,
     bool *verified);
 
@@ -1969,8 +1969,8 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_transfers)(void *cls,
                       const char *instance_id,
                       const char *payto_uri,
-                      struct GNUNET_TIME_Absolute before,
-                      struct GNUNET_TIME_Absolute after,
+                      struct GNUNET_TIME_Timestamp before,
+                      struct GNUNET_TIME_Timestamp after,
                       int64_t limit,
                       uint64_t offset,
                       enum TALER_EXCHANGE_YesNoAll yna,
@@ -2000,8 +2000,8 @@ struct TALER_MERCHANTDB_Plugin
     const struct GNUNET_HashCode *h_wire_method,
     const struct TALER_Amount *wire_fee,
     const struct TALER_Amount *closing_fee,
-    struct GNUNET_TIME_Absolute start_date,
-    struct GNUNET_TIME_Absolute end_date,
+    struct GNUNET_TIME_Timestamp start_date,
+    struct GNUNET_TIME_Timestamp end_date,
     const struct TALER_MasterSignatureP *exchange_sig);
 
 
@@ -2031,7 +2031,7 @@ struct TALER_MERCHANTDB_Plugin
                     const char *exchange_url,
                     const char *payto_uri,
                     const struct TALER_Amount *initial_balance,
-                    struct GNUNET_TIME_Absolute expiration);
+                    struct GNUNET_TIME_Timestamp expiration);
 
 
   /**
@@ -2069,7 +2069,7 @@ struct TALER_MERCHANTDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*lookup_reserves)(void *cls,
                      const char *instance_id,
-                     struct GNUNET_TIME_Absolute created_after,
+                     struct GNUNET_TIME_Timestamp created_after,
                      enum TALER_EXCHANGE_YesNoAll active,
                      enum TALER_EXCHANGE_YesNoAll failures,
                      TALER_MERCHANTDB_ReservesCallback cb,
@@ -2169,7 +2169,7 @@ struct TALER_MERCHANTDB_Plugin
                    const char *justification,
                    const char *next_url,
                    struct GNUNET_HashCode *tip_id,
-                   struct GNUNET_TIME_Absolute *expiration);
+                   struct GNUNET_TIME_Timestamp *expiration);
 
 
   /**
@@ -2216,7 +2216,7 @@ struct TALER_MERCHANTDB_Plugin
                 const struct GNUNET_HashCode *tip_id,
                 struct TALER_Amount *total_authorized,
                 struct TALER_Amount *total_picked_up,
-                struct GNUNET_TIME_Absolute *expiration,
+                struct GNUNET_TIME_Timestamp *expiration,
                 char **exchange_url,
                 struct TALER_ReservePrivateKeyP *reserve_priv);
 
@@ -2268,7 +2268,7 @@ struct TALER_MERCHANTDB_Plugin
                         struct TALER_Amount *total_authorized,
                         struct TALER_Amount *total_picked_up,
                         char **justification,
-                        struct GNUNET_TIME_Absolute *expiration,
+                        struct GNUNET_TIME_Timestamp *expiration,
                         struct TALER_ReservePublicKeyP *reserve_pub,
                         unsigned int *pickups_length,
                         struct TALER_MERCHANTDB_PickupDetails **pickups);