diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-11-01 16:43:59 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-11-01 16:43:59 +0100 |
| commit | 481ffc1a0a2c808316877a76d74262aa61274a26 (patch) | |
| tree | a9d39ddc70f8c7037c8f50919495e567873f8719 /src/exchange/taler-exchange-httpd_purses_merge.c | |
| parent | 22357678a088836aca5cd2c7e78c2c6702b6092c (diff) | |
remove wad fee, kyc fee and kyc-timeout
Diffstat (limited to 'src/exchange/taler-exchange-httpd_purses_merge.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_merge.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c index 0bb8a186..cd6f8547 100644 --- a/src/exchange/taler-exchange-httpd_purses_merge.c +++ b/src/exchange/taler-exchange-httpd_purses_merge.c @@ -168,15 +168,20 @@ reply_merge_success (struct MHD_Connection *connection, } else { +#if WAD_NOT_IMPLEMENTED + /* FIXME: figure out partner, lookup wad fee by partner! */ if (0 > TALER_amount_subtract (&merge_amount, &pcc->target_amount, - &pcc->wf->wad)) + &wad_fee)) { GNUNET_assert (GNUNET_OK == TALER_amount_set_zero (TEH_currency, &merge_amount)); } +#else + merge_amount = pcc->target_amount; +#endif } if (TALER_EC_NONE != (ec = TALER_exchange_online_purse_merged_sign ( |