summaryrefslogtreecommitdiff
path: root/src/exchange/taler-exchange-httpd_responses.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-06-05 21:00:41 +0200
committerChristian Grothoff <christian@grothoff.org>2022-06-05 21:00:49 +0200
commitbdbd2a464df579c014d71800cf72571dc73ed645 (patch)
tree2c68b7a2b7bc95c2aaca0b4500fc79b4658d7d30 /src/exchange/taler-exchange-httpd_responses.c
parent60f609135d04ce3bb4ecad6405572bb6d601fa43 (diff)
downloadexchange-bdbd2a464df579c014d71800cf72571dc73ed645.tar.gz
exchange-bdbd2a464df579c014d71800cf72571dc73ed645.tar.bz2
exchange-bdbd2a464df579c014d71800cf72571dc73ed645.zip
no purse fee if purse is successfully merged
Diffstat (limited to 'src/exchange/taler-exchange-httpd_responses.c')
-rw-r--r--src/exchange/taler-exchange-httpd_responses.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c
index e5309f9e3..429647e16 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -778,12 +778,7 @@ TEH_RESPONSE_compile_reserve_history (
{
const struct TALER_EXCHANGEDB_PurseMerge *merge =
pos->details.merge;
- struct TALER_Amount amount;
- GNUNET_assert (0 <=
- TALER_amount_subtract (&amount,
- &merge->amount_with_fee,
- &merge->purse_fee));
if (0 !=
json_array_append_new (
json_history,
@@ -807,7 +802,7 @@ TEH_RESPONSE_compile_reserve_history (
GNUNET_JSON_pack_timestamp ("purse_expiration",
merge->purse_expiration),
TALER_JSON_pack_amount ("amount",
- &amount),
+ &merge->amount_with_fee),
TALER_JSON_pack_amount ("purse_fee",
&merge->purse_fee),
GNUNET_JSON_pack_bool ("merged",