diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-12-14 16:10:40 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-12-14 16:10:40 +0100 |
commit | ad5d54f48534ac0ad5bfd7f048bd7782e674a89b (patch) | |
tree | 4443e41c1aec412d82642b194aa3d837c9eb5cfd /src/include/taler_merchant_service.h | |
parent | 49e2e44b09dd845d0922c0acef5ff487b52bf26d (diff) | |
download | merchant-ad5d54f48534ac0ad5bfd7f048bd7782e674a89b.tar.gz merchant-ad5d54f48534ac0ad5bfd7f048bd7782e674a89b.tar.bz2 merchant-ad5d54f48534ac0ad5bfd7f048bd7782e674a89b.zip |
migration to protocol v11
Diffstat (limited to 'src/include/taler_merchant_service.h')
-rw-r--r-- | src/include/taler_merchant_service.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index 58148896..7520b553 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -997,7 +997,7 @@ typedef void uint64_t total_sold, uint64_t total_lost, const json_t *location, - struct GNUNET_TIME_Absolute next_restock); + struct GNUNET_TIME_Timestamp next_restock); /** @@ -1085,7 +1085,7 @@ TALER_MERCHANT_products_post ( const json_t *taxes, int64_t total_stock, const json_t *address, - struct GNUNET_TIME_Absolute next_restock, + struct GNUNET_TIME_Timestamp next_restock, TALER_MERCHANT_ProductsPostCallback cb, void *cb_cls); @@ -1161,7 +1161,7 @@ TALER_MERCHANT_product_patch ( int64_t total_stock, uint64_t total_lost, const json_t *address, - struct GNUNET_TIME_Absolute next_restock, + struct GNUNET_TIME_Timestamp next_restock, TALER_MERCHANT_ProductPatchCallback cb, void *cb_cls); @@ -1353,7 +1353,7 @@ struct TALER_MERCHANT_PostOrdersReply * When does the backend expect the stock to be * restocked? 0 for unknown. */ - struct GNUNET_TIME_Absolute restock_expected; + struct GNUNET_TIME_Timestamp restock_expected; } gone; @@ -1480,7 +1480,7 @@ struct TALER_MERCHANT_OrderEntry * Time when the order was created. Useful for filtering by * 'date' (in #TALER_MERCHANT_orders_get2()). */ - struct GNUNET_TIME_Absolute timestamp; + struct GNUNET_TIME_Timestamp timestamp; /** * Serial ID of the order. Useful for filtering by 'start_row' @@ -1569,7 +1569,7 @@ TALER_MERCHANT_orders_get2 ( enum TALER_EXCHANGE_YesNoAll paid, enum TALER_EXCHANGE_YesNoAll refunded, enum TALER_EXCHANGE_YesNoAll wired, - struct GNUNET_TIME_Absolute date, + struct GNUNET_TIME_Timestamp date, uint64_t start_row, int64_t delta, struct GNUNET_TIME_Relative timeout, @@ -1695,7 +1695,7 @@ struct TALER_MERCHANT_WireTransfer * as the time at which the exchange initiated the transfer * may differ from the time the bank or the merchant observed). */ - struct GNUNET_TIME_Absolute execution_time; + struct GNUNET_TIME_Timestamp execution_time; /** * Wire transfer subject. @@ -1761,7 +1761,7 @@ struct TALER_MERCHANT_RefundOrderDetail /** * Time when the refund was granted. */ - struct GNUNET_TIME_Absolute refund_time; + struct GNUNET_TIME_Timestamp refund_time; /** * Total amount that was refunded. @@ -1935,7 +1935,7 @@ struct TALER_MERCHANT_OrderStatusResponse /** * Time when the order was created. */ - struct GNUNET_TIME_Absolute creation_time; + struct GNUNET_TIME_Timestamp creation_time; /** * Total amount the order is about (amount to be paid by customer). @@ -2291,9 +2291,9 @@ TALER_MERCHANT_order_pay (struct GNUNET_CURL_Context *ctx, const struct TALER_Amount *max_fee, const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_MerchantSignatureP *merchant_sig, - struct GNUNET_TIME_Absolute timestamp, - struct GNUNET_TIME_Absolute refund_deadline, - struct GNUNET_TIME_Absolute pay_deadline, + struct GNUNET_TIME_Timestamp timestamp, + struct GNUNET_TIME_Timestamp refund_deadline, + struct GNUNET_TIME_Timestamp pay_deadline, const struct TALER_MerchantWireHash *h_wire, const char *order_id, unsigned int num_coins, @@ -2736,7 +2736,7 @@ typedef void (*TALER_MERCHANT_PostTransfersCallback) ( void *cls, const struct TALER_MERCHANT_HttpResponse *hr, - struct GNUNET_TIME_Absolute execution_time, + struct GNUNET_TIME_Timestamp execution_time, const struct TALER_Amount *total_amount, const struct TALER_Amount *wire_fee, unsigned int details_length, @@ -2876,7 +2876,7 @@ struct TALER_MERCHANT_TransferData * Time of the wire transfer, according to the exchange. * 0 for not provided by the exchange. */ - struct GNUNET_TIME_Absolute execution_time; + struct GNUNET_TIME_Timestamp execution_time; /** * Did we check the exchange's answer and are happy about it? False if we @@ -2941,8 +2941,8 @@ TALER_MERCHANT_transfers_get ( struct GNUNET_CURL_Context *ctx, const char *backend_url, const char *payto_uri, - const struct GNUNET_TIME_Absolute before, - const struct GNUNET_TIME_Absolute after, + const struct GNUNET_TIME_Timestamp before, + const struct GNUNET_TIME_Timestamp after, int64_t limit, uint64_t offset, enum TALER_EXCHANGE_YesNoAll verified, @@ -3040,12 +3040,12 @@ struct TALER_MERCHANT_ReserveSummary /** * Timestamp when it was established */ - struct GNUNET_TIME_Absolute creation_time; + struct GNUNET_TIME_Timestamp creation_time; /** * Timestamp when it expires */ - struct GNUNET_TIME_Absolute expiration_time; + struct GNUNET_TIME_Timestamp expiration_time; /** * Initial amount as per reserve creation call @@ -3108,7 +3108,7 @@ typedef void struct TALER_MERCHANT_ReservesGetHandle * TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx, const char *backend_url, - struct GNUNET_TIME_Absolute after, + struct GNUNET_TIME_Timestamp after, enum TALER_EXCHANGE_YesNoAll active, enum TALER_EXCHANGE_YesNoAll failures, TALER_MERCHANT_ReservesGetCallback cb, @@ -3232,7 +3232,7 @@ typedef void const struct TALER_MERCHANT_HttpResponse *hr, struct GNUNET_HashCode *tip_id, const char *tip_uri, - struct GNUNET_TIME_Absolute tip_expiration); + struct GNUNET_TIME_Timestamp tip_expiration); /** @@ -3384,7 +3384,7 @@ typedef void (*TALER_MERCHANT_TipWalletGetCallback) ( void *cls, const struct TALER_MERCHANT_HttpResponse *hr, - struct GNUNET_TIME_Absolute expiration, + struct GNUNET_TIME_Timestamp expiration, const char *exchange_url, const struct TALER_Amount *amount_remaining); @@ -3465,7 +3465,7 @@ typedef void const struct TALER_Amount *total_authorized, const struct TALER_Amount *total_picked_up, const char *reason, - struct GNUNET_TIME_Absolute expiration, + struct GNUNET_TIME_Timestamp expiration, const struct TALER_ReservePublicKeyP *reserve_pub, unsigned int pickups_length, const struct TALER_MERCHANT_PickupDetail pickups[]); |