taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve error response for withdrawal

Browse Source
This commit is contained in:
Florian Dold 2022-01-10 01:23:46 +01:00
parent e30989c930
commit 14efa23a2b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit b0dd85e8187f33a1f92dd5eb31082050d333e168 Subproject commit 9b8a787580307cea5a38359c485d521cd8ece820

8
src/exchange/taler-exchange-httpd_withdraw.c
View File

@ -40,6 +40,7 @@
* *
* @param connection connection to the client * @param connection connection to the client
* @param ebalance expected balance based on our database * @param ebalance expected balance based on our database
* @param withdraw_amount amount that the client requested to withdraw
* @param rh reserve history to return * @param rh reserve history to return
* @return MHD result code * @return MHD result code
*/ */
@ -47,6 +48,7 @@ static MHD_RESULT
reply_withdraw_insufficient_funds ( reply_withdraw_insufficient_funds (
struct MHD_Connection *connection, struct MHD_Connection *connection,
const struct TALER_Amount *ebalance, const struct TALER_Amount *ebalance,
const struct TALER_Amount *withdraw_amount,
const struct TALER_EXCHANGEDB_ReserveHistory *rh) const struct TALER_EXCHANGEDB_ReserveHistory *rh)
{ {
json_t *json_history; json_t *json_history;
@ -76,6 +78,8 @@ reply_withdraw_insufficient_funds (
TALER_JSON_pack_ec (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS), TALER_JSON_pack_ec (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS),
TALER_JSON_pack_amount ("balance", TALER_JSON_pack_amount ("balance",
&balance), &balance),
TALER_JSON_pack_amount ("requested_amount",
withdraw_amount),
GNUNET_JSON_pack_array_steal ("history", GNUNET_JSON_pack_array_steal ("history",
json_history)); json_history));
} }
@ -174,6 +178,7 @@ withdraw_transaction (void *cls,
{ {
struct TALER_EXCHANGEDB_ReserveHistory *rh; struct TALER_EXCHANGEDB_ReserveHistory *rh;
struct TALER_Amount balance; struct TALER_Amount balance;
struct TALER_Amount requested_amount;
TEH_plugin->rollback (TEH_plugin->cls); TEH_plugin->rollback (TEH_plugin->cls);
// FIXME: maybe start read-committed here? // FIXME: maybe start read-committed here?
@ -204,8 +209,11 @@ withdraw_transaction (void *cls,
"reserve history"); "reserve history");
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
TALER_amount_ntoh (&requested_amount,
&wc->wsrd.amount_with_fee);
*mhd_ret = reply_withdraw_insufficient_funds (connection, *mhd_ret = reply_withdraw_insufficient_funds (connection,
&balance, &balance,
&requested_amount,
rh); rh);
TEH_plugin->free_reserve_history (TEH_plugin->cls, TEH_plugin->free_reserve_history (TEH_plugin->cls,
rh); rh);