commit ee64f2a05e31f8b3799e8c5e364570adf55306a6
parent abeb285227b00a88ed5caa66ae6ffb880f5d6d17
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 31 May 2026 15:49:40 +0200
fix rrc_serial => refresh_id rename
Diffstat:
3 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/exchangedb/insert_records_by_table.c b/src/exchangedb/insert_records_by_table.c
@@ -1284,18 +1284,23 @@ irbt_cb_table_recoup_refresh (struct TALER_EXCHANGEDB_PostgresContext *pg,
const struct TALER_EXCHANGEDB_TableData *td)
{
struct GNUNET_PQ_QueryParam params[] = {
- GNUNET_PQ_query_param_uint64 (&td->serial),
- GNUNET_PQ_query_param_auto_from_type (&td->details.recoup_refresh.coin_sig),
+ GNUNET_PQ_query_param_uint64 (
+ &td->serial),
+ GNUNET_PQ_query_param_auto_from_type (
+ &td->details.recoup_refresh.coin_sig),
GNUNET_PQ_query_param_auto_from_type (
&td->details.recoup_refresh.coin_blind),
TALER_PQ_query_param_amount (
pg->conn,
&td->details.recoup_refresh.amount),
- GNUNET_PQ_query_param_timestamp (&td->details.recoup_refresh.timestamp),
- GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.known_coin_id),
+ GNUNET_PQ_query_param_timestamp (
+ &td->details.recoup_refresh.recoup_timestamp),
+ GNUNET_PQ_query_param_uint64 (
+ &td->details.recoup_refresh.known_coin_id),
GNUNET_PQ_query_param_auto_from_type (
&td->details.recoup_refresh.coin_pub),
- GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.rrc_serial),
+ GNUNET_PQ_query_param_uint64 (
+ &td->details.recoup_refresh.refresh_id),
GNUNET_PQ_query_param_end
};
@@ -1309,7 +1314,7 @@ irbt_cb_table_recoup_refresh (struct TALER_EXCHANGEDB_PostgresContext *pg,
",recoup_timestamp"
",known_coin_id"
",coin_pub"
- ",rrc_serial"
+ ",refresh_id"
") VALUES "
"($1, $2, $3, $4, $5, $6, $7, $8);");
return GNUNET_PQ_eval_prepared_non_select (pg->conn,
diff --git a/src/exchangedb/lookup_records_by_table.c b/src/exchangedb/lookup_records_by_table.c
@@ -1507,25 +1507,30 @@ lrbt_cb_table_recoup_refresh (void *cls,
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
- GNUNET_PQ_result_spec_uint64 ("serial",
- &td.serial),
- GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
- &td.details.recoup_refresh.coin_sig)
- ,
+ GNUNET_PQ_result_spec_uint64 (
+ "serial",
+ &td.serial),
+ GNUNET_PQ_result_spec_auto_from_type (
+ "coin_sig",
+ &td.details.recoup_refresh.coin_sig),
GNUNET_PQ_result_spec_auto_from_type (
"coin_blind",
&td.details.recoup_refresh.coin_blind),
- TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
- &td.details.recoup_refresh.amount),
- GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
- &td.details.recoup_refresh.timestamp),
- GNUNET_PQ_result_spec_uint64 ("known_coin_id",
- &td.details.recoup_refresh.known_coin_id),
+ TALER_PQ_RESULT_SPEC_AMOUNT (
+ "amount",
+ &td.details.recoup_refresh.amount),
+ GNUNET_PQ_result_spec_timestamp (
+ "recoup_timestamp",
+ &td.details.recoup_refresh.recoup_timestamp),
+ GNUNET_PQ_result_spec_uint64 (
+ "known_coin_id",
+ &td.details.recoup_refresh.known_coin_id),
GNUNET_PQ_result_spec_auto_from_type (
"coin_pub",
&td.details.recoup_refresh.coin_pub),
- GNUNET_PQ_result_spec_uint64 ("rrc_serial",
- &td.details.recoup_refresh.rrc_serial),
+ GNUNET_PQ_result_spec_uint64 (
+ "refresh_id",
+ &td.details.recoup_refresh.refresh_id),
GNUNET_PQ_result_spec_end
};
@@ -3436,7 +3441,7 @@ TALER_EXCHANGEDB_lookup_records_by_table (
",recoup_timestamp"
",coin_pub"
",known_coin_id"
- ",rrc_serial"
+ ",refresh_id"
" FROM recoup_refresh"
" WHERE recoup_refresh_uuid > $1"
" ORDER BY recoup_refresh_uuid ASC;");
diff --git a/src/include/exchange-database/lookup_records_by_table.h b/src/include/exchange-database/lookup_records_by_table.h
@@ -415,8 +415,8 @@ struct TALER_EXCHANGEDB_TableData
struct TALER_CoinSpendSignatureP coin_sig;
union GNUNET_CRYPTO_BlindingSecretP coin_blind;
struct TALER_Amount amount;
- struct GNUNET_TIME_Timestamp timestamp;
- uint64_t rrc_serial;
+ struct GNUNET_TIME_Timestamp recoup_timestamp;
+ uint64_t refresh_id;
} recoup_refresh;
struct