Time math macros.

This commit is contained in:
Marcello Stanisci 2019-04-09 18:12:11 +02:00
parent 75ac6b8063
commit 814522d21c
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
2 changed files with 28 additions and 9 deletions

View File

@ -39,6 +39,29 @@
#define CONFIG_FILE "bank.conf" #define CONFIG_FILE "bank.conf"
/**
* Adds to the current time.
*
* @param relative number of _seconds_ to add to the current time.
* @return a new absolute time, modified according to @e relative.
*/
#define NOWPLUSSECS(secs) \
GNUNET_TIME_absolute_add \
(now, \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
secs))
/**
* Subtracts from the current time.
*
* @param relative number of _seconds_ to add to the current time.
* @return a new absolute time, modified according to @e relative.
*/
#define NOWMINUSSECS(secs) \
GNUNET_TIME_absolute_subtract \
(now, \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, \
secs))
/** /**
* Bank process. * Bank process.
*/ */
@ -61,11 +84,12 @@ run (void *cls,
{ {
extern struct TALER_BANK_AuthenticationData AUTHS[]; extern struct TALER_BANK_AuthenticationData AUTHS[];
struct GNUNET_TIME_Absolute now;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Bank serves at `%s'\n", "Bank serves at `%s'\n",
bank_url); bank_url);
now = GNUNET_TIME_absolute_get ();
struct TALER_TESTING_Command commands[] = { struct TALER_TESTING_Command commands[] = {
TALER_TESTING_cmd_bank_history ("history-0", TALER_TESTING_cmd_bank_history ("history-0",
@ -76,19 +100,14 @@ run (void *cls,
NULL, /* start */ NULL, /* start */
5), 5),
#if 1
/**
* Just a dummy call to check if the logic doesn't crash.
*/
TALER_TESTING_cmd_bank_history_range_with_dates TALER_TESTING_cmd_bank_history_range_with_dates
("history-0-range", ("history-0-range",
bank_url, bank_url,
EXCHANGE_ACCOUNT_NUMBER, EXCHANGE_ACCOUNT_NUMBER,
TALER_BANK_DIRECTION_BOTH, TALER_BANK_DIRECTION_BOTH,
GNUNET_NO, GNUNET_NO,
GNUNET_TIME_UNIT_ZERO_ABS, NOWMINUSSECS (5),
GNUNET_TIME_UNIT_FOREVER_ABS), NOWPLUSSECS (5)),
#endif
TALER_TESTING_cmd_fakebank_transfer_with_subject TALER_TESTING_cmd_fakebank_transfer_with_subject
("deposit-1", ("deposit-1",

View File

@ -1150,7 +1150,7 @@ TALER_TESTING_cmd_bank_history_range_with_dates
hs->direction = direction; hs->direction = direction;
hs->ascending = ascending; hs->ascending = ascending;
hs->start_date = start_date; hs->start_date = start_date;
hs->end_date = start_date; hs->end_date = end_date;
struct TALER_TESTING_Command cmd = { struct TALER_TESTING_Command cmd = {
.label = label, .label = label,