commit 5da0d228c1a9eac6bd892264a48640c30fb05b28
parent b03f77ace16e7935db6115eb8010123c57a1444d
Author: Christian Grothoff <christian@grothoff.org>
Date: Wed, 14 May 2025 21:06:50 +0200
-fix FTBFS somehow unnoticed in previous commit
Diffstat:
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
@@ -19,13 +19,12 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
#include "taler_auditordb_plugin.h"
-#include "taler_exchangedb_lib.h"
-#include "taler_bank_service.h"
-#include "taler_signatures.h"
#include "report-lib.h"
#include "taler_dbevents.h"
+#include "taler_exchangedb_lib.h"
+
+
/**
* How many coin histories do we keep in RAM at any given point in time?
* Expect a few kB per coin history to be used. Used bound memory consumption
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
@@ -19,13 +19,10 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
#include "taler_auditordb_plugin.h"
-#include "taler_exchangedb_lib.h"
-#include "taler_bank_service.h"
-#include "taler_signatures.h"
#include "report-lib.h"
#include "taler_dbevents.h"
+#include "taler_exchangedb_lib.h"
/**
@@ -512,9 +509,9 @@ handle_reserve_in (
*
* @param cls our `struct ReserveContext`
* @param rowid unique serial ID for the refresh session in our DB
- * @param num_evs number of elements in @e h_blind_evs
- * @param h_blind_evs array @e num_evs of blinded hashes of the coin's public keys
- * @param denom_serials array @e num_evs of serial ID's of denominations in our DB
+ * @param num_denom_serials number of elements in @e denom_serials array
+ * @param denom_serials array with length @e num_denom_serials of serial ID's of denominations in our DB
+ * @param selected_h hash over the gamma-selected planchets
* @param h_planchets running hash over all hashes of blinded planchets in the original withdraw request
* @param blinding_seed the master seed used for CS denominations; might be NULL
* @param age_proof_required true if the withdraw request required an age proof.
@@ -530,9 +527,9 @@ static enum GNUNET_GenericReturnValue
handle_withdrawals (
void *cls,
uint64_t rowid,
- size_t num_evs,
- const struct TALER_BlindedCoinHashP *h_blind_evs,
+ size_t num_denom_serials,
const uint64_t *denom_serials,
+ const struct TALER_HashBlindedPlanchetsP *selected_h,
const struct TALER_HashBlindedPlanchetsP *h_planchets,
const struct TALER_BlindingMasterSeedP *blinding_seed,
bool age_proof_required,
@@ -562,7 +559,7 @@ handle_withdrawals (
GNUNET_assert (GNUNET_OK == TALER_amount_set_zero (TALER_ARL_currency,
&auditor_amount_with_fee));
- for (size_t i = 0; i < num_evs; i++)
+ for (size_t i = 0; i < num_denom_serials; i++)
{
/* lookup denomination pub data (make sure denom_pub is valid, establish fees);
initializes wsrd.h_denomination_pub! */
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
@@ -5741,7 +5741,6 @@ struct TALER_EXCHANGEDB_Plugin
* in monotonically increasing order.
*
* @param cls closure
- * @param account_name name of the account for which we do the selection
* @param serial_id highest serial ID to exclude (select strictly larger)
* @param cb function to call on each result
* @param cb_cls closure for @a cb