-fix FTBFS

This commit is contained in:
Christian Grothoff 2021-12-15 11:38:57 +01:00
parent fdfcb29027
commit 110fe5b640
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC

View File

@ -134,10 +134,10 @@ run (void *cls)
struct TALER_DenominationPrivateKey denom_priv; struct TALER_DenominationPrivateKey denom_priv;
struct TALER_DenominationPublicKey denom_pub; struct TALER_DenominationPublicKey denom_pub;
struct TALER_DenominationHash denom_pub_hash; struct TALER_DenominationHash denom_pub_hash;
struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Timestamp now;
struct GNUNET_TIME_Absolute past; struct GNUNET_TIME_Timestamp past;
struct GNUNET_TIME_Absolute future; struct GNUNET_TIME_Timestamp future;
struct GNUNET_TIME_Absolute date; struct GNUNET_TIME_Timestamp date;
RND_BLK (&master_pub); RND_BLK (&master_pub);
RND_BLK (&reserve_pub); RND_BLK (&reserve_pub);
@ -152,16 +152,17 @@ run (void *cls)
TALER_denom_priv_free (&denom_priv); TALER_denom_priv_free (&denom_priv);
TALER_denom_pub_free (&denom_pub); TALER_denom_pub_free (&denom_pub);
now = GNUNET_TIME_absolute_get (); now = GNUNET_TIME_timestamp_get ();
(void) GNUNET_TIME_round_abs (&now); past = GNUNET_TIME_absolute_to_timestamp (
past = GNUNET_TIME_absolute_subtract (now, GNUNET_TIME_absolute_subtract (now.abs_time,
GNUNET_TIME_relative_multiply ( GNUNET_TIME_relative_multiply (
GNUNET_TIME_UNIT_HOURS, GNUNET_TIME_UNIT_HOURS,
4)); 4)));
future = GNUNET_TIME_absolute_add (now, future = GNUNET_TIME_absolute_to_timestamp (
GNUNET_TIME_absolute_add (now.abs_time,
GNUNET_TIME_relative_multiply ( GNUNET_TIME_relative_multiply (
GNUNET_TIME_UNIT_HOURS, GNUNET_TIME_UNIT_HOURS,
4)); 4)));
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Test: auditor_insert_exchange\n"); "Test: auditor_insert_exchange\n");
@ -488,7 +489,7 @@ run (void *cls)
select_historic_denom_revenue_result ( select_historic_denom_revenue_result (
void *cls, void *cls,
const struct TALER_DenominationHash *denom_pub_hash2, const struct TALER_DenominationHash *denom_pub_hash2,
struct GNUNET_TIME_Absolute revenue_timestamp2, struct GNUNET_TIME_Timestamp revenue_timestamp2,
const struct TALER_Amount *revenue_balance2, const struct TALER_Amount *revenue_balance2,
const struct TALER_Amount *loss2) const struct TALER_Amount *loss2)
{ {
@ -548,12 +549,11 @@ run (void *cls)
"Test: select_historic_reserve_revenue\n"); "Test: select_historic_reserve_revenue\n");
int int
select_historic_reserve_revenue_result (void *cls, select_historic_reserve_revenue_result (
struct GNUNET_TIME_Absolute void *cls,
start_time2, struct GNUNET_TIME_Timestamp start_time2,
struct GNUNET_TIME_Absolute end_time2, struct GNUNET_TIME_Timestamp end_time2,
const struct const struct TALER_Amount *reserve_profits2)
TALER_Amount *reserve_profits2)
{ {
static int n = 0; static int n = 0;