From 814522d21c320d823ccb8b8dda1acbb7ae5538a9 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 9 Apr 2019 18:12:11 +0200 Subject: Time math macros. --- src/bank-lib/test_bank_api_new.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'src/bank-lib/test_bank_api_new.c') diff --git a/src/bank-lib/test_bank_api_new.c b/src/bank-lib/test_bank_api_new.c index bd3d9245..c35bb13b 100644 --- a/src/bank-lib/test_bank_api_new.c +++ b/src/bank-lib/test_bank_api_new.c @@ -39,6 +39,29 @@ #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. */ @@ -61,11 +84,12 @@ run (void *cls, { extern struct TALER_BANK_AuthenticationData AUTHS[]; + struct GNUNET_TIME_Absolute now; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Bank serves at `%s'\n", bank_url); - + now = GNUNET_TIME_absolute_get (); struct TALER_TESTING_Command commands[] = { TALER_TESTING_cmd_bank_history ("history-0", @@ -76,19 +100,14 @@ run (void *cls, NULL, /* start */ 5), - #if 1 - /** - * Just a dummy call to check if the logic doesn't crash. - */ TALER_TESTING_cmd_bank_history_range_with_dates ("history-0-range", bank_url, EXCHANGE_ACCOUNT_NUMBER, TALER_BANK_DIRECTION_BOTH, GNUNET_NO, - GNUNET_TIME_UNIT_ZERO_ABS, - GNUNET_TIME_UNIT_FOREVER_ABS), - #endif + NOWMINUSSECS (5), + NOWPLUSSECS (5)), TALER_TESTING_cmd_fakebank_transfer_with_subject ("deposit-1", -- cgit v1.2.3