diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-07-23 20:40:13 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-07-23 20:40:13 +0200 |
| commit | 325b60989faadb54213af578bb9b1b705d022726 (patch) | |
| tree | 2d527bb489a09bd601b5defbd04c08109eabce4d /src/exchange/taler-exchange-httpd_recoup.c | |
| parent | 098bd64f39ce9f6bfca54fe2505b91a079c22f16 (diff) | |
| download | exchange-325b60989faadb54213af578bb9b1b705d022726.tar.gz exchange-325b60989faadb54213af578bb9b1b705d022726.tar.bz2 exchange-325b60989faadb54213af578bb9b1b705d022726.zip | |
-use new GNUNET_TIME functions
Diffstat (limited to 'src/exchange/taler-exchange-httpd_recoup.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_recoup.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c index 0c49cc68a..991b16e27 100644 --- a/src/exchange/taler-exchange-httpd_recoup.c +++ b/src/exchange/taler-exchange-httpd_recoup.c @@ -364,7 +364,6 @@ verify_and_execute_recoup (struct MHD_Connection *connection, void *coin_ev; size_t coin_ev_size; MHD_RESULT mret; - struct GNUNET_TIME_Absolute now; /* check denomination exists and is in recoup mode */ dk = TEH_keys_denomination_by_hash (&coin->denom_pub_hash, @@ -372,10 +371,12 @@ verify_and_execute_recoup (struct MHD_Connection *connection, &mret); if (NULL == dk) return mret; - now = GNUNET_TIME_absolute_get (); - (void) GNUNET_TIME_round_abs (&now); - if (now.abs_value_us >= dk->meta.expire_deposit.abs_value_us) + if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit)) { + struct GNUNET_TIME_Absolute now; + + now = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&now); /* This denomination is past the expiration time for recoup */ return TEH_RESPONSE_reply_expired_denom_pub_hash ( connection, @@ -384,8 +385,12 @@ verify_and_execute_recoup (struct MHD_Connection *connection, TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED, "RECOUP"); } - if (now.abs_value_us < dk->meta.start.abs_value_us) + if (GNUNET_TIME_absolute_is_future (dk->meta.start)) { + struct GNUNET_TIME_Absolute now; + + now = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&now); /* This denomination is not yet valid */ return TEH_RESPONSE_reply_expired_denom_pub_hash ( connection, @@ -396,6 +401,10 @@ verify_and_execute_recoup (struct MHD_Connection *connection, } if (! dk->recoup_possible) { + struct GNUNET_TIME_Absolute now; + + now = GNUNET_TIME_absolute_get (); + (void) GNUNET_TIME_round_abs (&now); /* This denomination is not eligible for recoup */ return TEH_RESPONSE_reply_expired_denom_pub_hash ( connection, |