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/backend/taler-merchant-httpd_private-get-transfers.c | |
parent | 49e2e44b09dd845d0922c0acef5ff487b52bf26d (diff) |
migration to protocol v11
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-get-transfers.c')
-rw-r--r-- | src/backend/taler-merchant-httpd_private-get-transfers.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/taler-merchant-httpd_private-get-transfers.c b/src/backend/taler-merchant-httpd_private-get-transfers.c index c1d243f7..03a7beaa 100644 --- a/src/backend/taler-merchant-httpd_private-get-transfers.c +++ b/src/backend/taler-merchant-httpd_private-get-transfers.c @@ -49,7 +49,7 @@ transfer_cb (void *cls, 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) { @@ -72,11 +72,11 @@ transfer_cb (void *cls, GNUNET_JSON_pack_bool ("confirmed", confirmed), GNUNET_JSON_pack_allow_null ( - GNUNET_JSON_pack_time_abs ( + GNUNET_JSON_pack_timestamp ( "execution_time", - GNUNET_TIME_absolute_is_never (execution_time) - ? GNUNET_TIME_UNIT_ZERO_ABS /* => field omitted */ - : execution_time) )); + GNUNET_TIME_absolute_is_never (execution_time.abs_time) + ? GNUNET_TIME_UNIT_ZERO_TS /* => field omitted */ + : execution_time)) ); GNUNET_assert (0 == json_array_append_new (ja, r)); @@ -97,8 +97,8 @@ TMH_private_get_transfers (const struct TMH_RequestHandler *rh, struct TMH_HandlerContext *hc) { const char *payto_uri; - struct GNUNET_TIME_Absolute before = GNUNET_TIME_UNIT_FOREVER_ABS; - struct GNUNET_TIME_Absolute after = GNUNET_TIME_UNIT_ZERO_ABS; + struct GNUNET_TIME_Timestamp before = GNUNET_TIME_UNIT_FOREVER_TS; + struct GNUNET_TIME_Timestamp after = GNUNET_TIME_UNIT_ZERO_TS; int64_t limit = -20; uint64_t offset; enum TALER_EXCHANGE_YesNoAll verified; @@ -114,8 +114,8 @@ TMH_private_get_transfers (const struct TMH_RequestHandler *rh, "before"); if ( (NULL != before_s) && (GNUNET_OK != - GNUNET_STRINGS_fancy_time_to_absolute (before_s, - &before)) ) + GNUNET_STRINGS_fancy_time_to_timestamp (before_s, + &before)) ) return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, TALER_EC_GENERIC_PARAMETER_MALFORMED, @@ -129,8 +129,8 @@ TMH_private_get_transfers (const struct TMH_RequestHandler *rh, "after"); if ( (NULL != after_s) && (GNUNET_OK != - GNUNET_STRINGS_fancy_time_to_absolute (after_s, - &after)) ) + GNUNET_STRINGS_fancy_time_to_timestamp (after_s, + &after)) ) return TALER_MHD_reply_with_error (connection, MHD_HTTP_BAD_REQUEST, TALER_EC_GENERIC_PARAMETER_MALFORMED, |