summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-10-27 23:35:14 +0200
committerChristian Grothoff <christian@grothoff.org>2021-10-27 23:35:14 +0200
commitaa999277016bb9a0ee9274365e19233c9bab93e3 (patch)
treeb0d1c53782aa834c92e02bc457af2dcc505144eb
parentefd4e19bd2971e0ea1b7cb0f1df4aa4ca21b4e2c (diff)
downloadexchange-aa999277016bb9a0ee9274365e19233c9bab93e3.tar.gz
exchange-aa999277016bb9a0ee9274365e19233c9bab93e3.tar.bz2
exchange-aa999277016bb9a0ee9274365e19233c9bab93e3.zip
fix FTBFS of auditordb
-rw-r--r--src/auditordb/test_auditordb.c46
1 files changed, 25 insertions, 21 deletions
diff --git a/src/auditordb/test_auditordb.c b/src/auditordb/test_auditordb.c
index 237d8ec8..7e5a9703 100644
--- a/src/auditordb/test_auditordb.c
+++ b/src/auditordb/test_auditordb.c
@@ -130,23 +130,29 @@ run (void *cls)
struct TALER_MasterPublicKeyP master_pub;
struct TALER_ReservePublicKeyP reserve_pub;
- struct GNUNET_HashCode rnd_hash;
- RND_BLK (&master_pub);
- RND_BLK (&reserve_pub);
- RND_BLK (&rnd_hash);
-
+ struct TALER_DenominationHash rnd_hash;
struct TALER_DenominationPrivateKey denom_priv;
struct TALER_DenominationPublicKey denom_pub;
- struct GNUNET_HashCode denom_pub_hash;
+ struct TALER_DenominationHash denom_pub_hash;
+ struct GNUNET_TIME_Absolute now;
+ struct GNUNET_TIME_Absolute past;
+ struct GNUNET_TIME_Absolute future;
+ struct GNUNET_TIME_Absolute date;
- denom_priv.rsa_private_key = GNUNET_CRYPTO_rsa_private_key_create (1024);
- denom_pub.rsa_public_key = GNUNET_CRYPTO_rsa_private_key_get_public (
- denom_priv.rsa_private_key);
- GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, &denom_pub_hash);
- GNUNET_CRYPTO_rsa_private_key_free (denom_priv.rsa_private_key);
- GNUNET_CRYPTO_rsa_public_key_free (denom_pub.rsa_public_key);
+ RND_BLK (&master_pub);
+ RND_BLK (&reserve_pub);
+ RND_BLK (&rnd_hash);
+ denom_priv.cipher = TALER_DENOMINATION_RSA;
+ denom_priv.details.rsa_private_key = GNUNET_CRYPTO_rsa_private_key_create (
+ 1024);
+ TALER_denom_priv_to_pub (&denom_priv,
+ 0, /* age mask */
+ &denom_pub);
+ TALER_denom_pub_hash (&denom_pub,
+ &denom_pub_hash);
+ TALER_denom_priv_free (&denom_priv);
+ TALER_denom_pub_free (&denom_pub);
- struct GNUNET_TIME_Absolute now, past, future, date;
now = GNUNET_TIME_absolute_get ();
(void) GNUNET_TIME_round_abs (&now);
past = GNUNET_TIME_absolute_subtract (now,
@@ -480,14 +486,12 @@ run (void *cls)
"Test: select_historic_denom_revenue\n");
int
- select_historic_denom_revenue_result (void *cls,
- const struct
- GNUNET_HashCode *denom_pub_hash2,
- struct GNUNET_TIME_Absolute
- revenue_timestamp2,
- const struct
- TALER_Amount *revenue_balance2,
- const struct TALER_Amount *loss2)
+ select_historic_denom_revenue_result (
+ void *cls,
+ const struct TALER_DenominationHash *denom_pub_hash2,
+ struct GNUNET_TIME_Absolute revenue_timestamp2,
+ const struct TALER_Amount *revenue_balance2,
+ const struct TALER_Amount *loss2)
{
static int n = 0;