diff --git a/src/exchange/taler-exchange-httpd_age-withdraw.c b/src/exchange/taler-exchange-httpd_age-withdraw.c index 6e337e5e1..c451e5266 100644 --- a/src/exchange/taler-exchange-httpd_age-withdraw.c +++ b/src/exchange/taler-exchange-httpd_age-withdraw.c @@ -740,7 +740,6 @@ age_withdraw_transaction (void *cls, bool age_ok = false; bool conflict = false; uint16_t allowed_maximum_age = 0; - uint64_t ruuid; qs = TEH_plugin->do_age_withdraw (TEH_plugin->cls, &awc->commitment, @@ -749,8 +748,7 @@ age_withdraw_transaction (void *cls, &balance_ok, &age_ok, &allowed_maximum_age, - &conflict, - &ruuid); + &conflict); if (0 > qs) { if (GNUNET_DB_STATUS_HARD_ERROR == qs) diff --git a/src/exchangedb/exchange_do_age_withdraw.sql b/src/exchangedb/exchange_do_age_withdraw.sql index 3f1d682a4..d6ae118ae 100644 --- a/src/exchangedb/exchange_do_age_withdraw.sql +++ b/src/exchangedb/exchange_do_age_withdraw.sql @@ -32,8 +32,7 @@ CREATE OR REPLACE FUNCTION exchange_do_age_withdraw( OUT balance_ok BOOLEAN, OUT age_ok BOOLEAN, OUT required_age INT2, -- in years ϵ [0,1..) - OUT conflict BOOLEAN, - OUT ruuid INT8) + OUT conflict BOOLEAN) LANGUAGE plpgsql AS $$ DECLARE @@ -55,13 +54,11 @@ SELECT ,current_balance_frac ,gc_date ,birthday - ,reserve_uuid INTO reserve_val ,reserve_frac ,reserve_gc ,reserve_birthday - ,ruuid FROM exchange.reserves WHERE reserves.reserve_pub=rpub; @@ -73,7 +70,6 @@ THEN age_ok=FALSE; required_age=0; conflict=FALSE; - ruuid=2; RETURN; END IF; diff --git a/src/exchangedb/pg_do_age_withdraw.h b/src/exchangedb/pg_do_age_withdraw.h index 5beb3133c..8f42bfb57 100644 --- a/src/exchangedb/pg_do_age_withdraw.h +++ b/src/exchangedb/pg_do_age_withdraw.h @@ -37,7 +37,6 @@ * @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] 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 */ enum GNUNET_DB_QueryStatus @@ -49,7 +48,6 @@ TEH_PG_do_age_withdraw ( bool *balance_ok, bool *age_ok, uint16_t *required_age, - bool *conflict, - uint64_t *ruuid); + bool *conflict); #endif diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index fb8bb2894..c4fcad562 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -3856,7 +3856,6 @@ struct TALER_EXCHANGEDB_Plugin * @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] 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 */ enum GNUNET_DB_QueryStatus @@ -3868,8 +3867,7 @@ struct TALER_EXCHANGEDB_Plugin bool *balance_ok, bool *age_ok, uint16_t *allowed_maximum_age, - bool *conflict, - uint64_t *ruuid); + bool *conflict); /** * Retrieve the details to a policy given by its hash_code