-ruuid not needed

This commit is contained in:
Özgür Kesim 2023-06-26 11:46:13 +02:00
parent 17001e445d
commit eeece1c96d
Signed by: oec
GPG Key ID: 3D76A56D79EDD9D7
4 changed files with 4 additions and 14 deletions

View File

@ -740,7 +740,6 @@ age_withdraw_transaction (void *cls,
bool age_ok = false; bool age_ok = false;
bool conflict = false; bool conflict = false;
uint16_t allowed_maximum_age = 0; uint16_t allowed_maximum_age = 0;
uint64_t ruuid;
qs = TEH_plugin->do_age_withdraw (TEH_plugin->cls, qs = TEH_plugin->do_age_withdraw (TEH_plugin->cls,
&awc->commitment, &awc->commitment,
@ -749,8 +748,7 @@ age_withdraw_transaction (void *cls,
&balance_ok, &balance_ok,
&age_ok, &age_ok,
&allowed_maximum_age, &allowed_maximum_age,
&conflict, &conflict);
&ruuid);
if (0 > qs) if (0 > qs)
{ {
if (GNUNET_DB_STATUS_HARD_ERROR == qs) if (GNUNET_DB_STATUS_HARD_ERROR == qs)

View File

@ -32,8 +32,7 @@ CREATE OR REPLACE FUNCTION exchange_do_age_withdraw(
OUT balance_ok BOOLEAN, OUT balance_ok BOOLEAN,
OUT age_ok BOOLEAN, OUT age_ok BOOLEAN,
OUT required_age INT2, -- in years ϵ [0,1..) OUT required_age INT2, -- in years ϵ [0,1..)
OUT conflict BOOLEAN, OUT conflict BOOLEAN)
OUT ruuid INT8)
LANGUAGE plpgsql LANGUAGE plpgsql
AS $$ AS $$
DECLARE DECLARE
@ -55,13 +54,11 @@ SELECT
,current_balance_frac ,current_balance_frac
,gc_date ,gc_date
,birthday ,birthday
,reserve_uuid
INTO INTO
reserve_val reserve_val
,reserve_frac ,reserve_frac
,reserve_gc ,reserve_gc
,reserve_birthday ,reserve_birthday
,ruuid
FROM exchange.reserves FROM exchange.reserves
WHERE reserves.reserve_pub=rpub; WHERE reserves.reserve_pub=rpub;
@ -73,7 +70,6 @@ THEN
age_ok=FALSE; age_ok=FALSE;
required_age=0; required_age=0;
conflict=FALSE; conflict=FALSE;
ruuid=2;
RETURN; RETURN;
END IF; END IF;

View File

@ -37,7 +37,6 @@
* @param[out] age_ok set to true if no age requirements are present on the reserve * @param[out] age_ok set to true if no age requirements are present on the reserve
* @param[out] required_age if @e age_ok is false, set to the maximum allowed age when withdrawing from this reserve * @param[out] required_age if @e age_ok is false, set to the maximum allowed age when withdrawing from this reserve
* @param[out] conflict set to true if there already is an entry in the database for the given pair (h_commitment, reserve_pub) * @param[out] conflict set to true if there already is an entry in the database for the given pair (h_commitment, reserve_pub)
* @param[out] ruuid set to the reserve's UUID (reserves table row)
* @return query execution status * @return query execution status
*/ */
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
@ -49,7 +48,6 @@ TEH_PG_do_age_withdraw (
bool *balance_ok, bool *balance_ok,
bool *age_ok, bool *age_ok,
uint16_t *required_age, uint16_t *required_age,
bool *conflict, bool *conflict);
uint64_t *ruuid);
#endif #endif

View File

@ -3856,7 +3856,6 @@ struct TALER_EXCHANGEDB_Plugin
* @param[out] balance_ok set to true if the balance was sufficient * @param[out] balance_ok set to true if the balance was sufficient
* @param[out] age_ok set to true if age requirements were met * @param[out] age_ok set to true if age requirements were met
* @param[out] allowed_maximum_age if @e age_ok is FALSE, this is set to the allowed maximum age * @param[out] allowed_maximum_age if @e age_ok is FALSE, this is set to the allowed maximum age
* @param[out] ruuid set to the reserve's UUID (reserves table row)
* @return query execution status * @return query execution status
*/ */
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
@ -3868,8 +3867,7 @@ struct TALER_EXCHANGEDB_Plugin
bool *balance_ok, bool *balance_ok,
bool *age_ok, bool *age_ok,
uint16_t *allowed_maximum_age, uint16_t *allowed_maximum_age,
bool *conflict, bool *conflict);
uint64_t *ruuid);
/** /**
* Retrieve the details to a policy given by its hash_code * Retrieve the details to a policy given by its hash_code