diff options
Diffstat (limited to 'src/lib/merchant_api_get_reserves.c')
| -rw-r--r-- | src/lib/merchant_api_get_reserves.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/merchant_api_get_reserves.c b/src/lib/merchant_api_get_reserves.c index 56bcd133..24a527d6 100644 --- a/src/lib/merchant_api_get_reserves.c +++ b/src/lib/merchant_api_get_reserves.c @@ -135,10 +135,10 @@ handle_reserves_get_finished (void *cls, struct GNUNET_JSON_Specification ispec[] = { GNUNET_JSON_spec_fixed_auto ("reserve_pub", &rd->reserve_pub), - TALER_JSON_spec_absolute_time ("creation_time", - &rd->creation_time), - TALER_JSON_spec_absolute_time ("expiration_time", - &rd->expiration_time), + GNUNET_JSON_spec_timestamp ("creation_time", + &rd->creation_time), + GNUNET_JSON_spec_timestamp ("expiration_time", + &rd->expiration_time), TALER_JSON_spec_amount_any ("merchant_initial_amount", &rd->merchant_initial_amount), TALER_JSON_spec_amount_any ("exchange_initial_amount", @@ -217,7 +217,7 @@ handle_reserves_get_finished (void *cls, 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, @@ -235,8 +235,8 @@ TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx, rgh->cb_cls = cb_cls; active_s = TALER_yna_to_string (active); failures_s = TALER_yna_to_string (failures); - after_s = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string ( - after)); + // FIXME: use different format? + after_s = GNUNET_strdup (GNUNET_TIME_timestamp2s (after)); rgh->url = TALER_url_join (backend_url, "private/reserves", "active", @@ -244,9 +244,9 @@ TALER_MERCHANT_reserves_get (struct GNUNET_CURL_Context *ctx, "failures", failures_s, "after", - after.abs_value_us != 0 - ? after_s - : NULL, + GNUNET_TIME_absolute_is_zero (after.abs_time) + ? NULL + : after_s, NULL); GNUNET_free (after_s); if (NULL == rgh->url) |