diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-04 21:59:55 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-06-04 22:00:02 +0200 |
| commit | a17781ba8d5f875b5150e524174c5f144aa6c0ba (patch) | |
| tree | c01f11a3810428471e6399b4961942732a21a1f1 /src/testing/testing_api_cmd_purse_deposit.c | |
| parent | 6512456dc2559577867fdce1f7fe7f1b5a12291f (diff) | |
| download | exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.tar.gz exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.tar.bz2 exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.zip | |
-more work on p2p payments and tests thereof
Diffstat (limited to 'src/testing/testing_api_cmd_purse_deposit.c')
| -rw-r--r-- | src/testing/testing_api_cmd_purse_deposit.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/src/testing/testing_api_cmd_purse_deposit.c b/src/testing/testing_api_cmd_purse_deposit.c index fa1b900da..0fa0998d2 100644 --- a/src/testing/testing_api_cmd_purse_deposit.c +++ b/src/testing/testing_api_cmd_purse_deposit.c @@ -201,9 +201,6 @@ deposit_cb (void *cls, /* Deposits complete, create trait! */ ds->reserve_history.type = TALER_EXCHANGE_RTT_MERGE; - ds->reserve_history.amount - = dr->details.success.purse_value_after_fees; -#if 0 { const struct TALER_EXCHANGE_Keys *keys; const struct TALER_EXCHANGE_GlobalFee *gf; @@ -213,12 +210,26 @@ deposit_cb (void *cls, gf = TALER_EXCHANGE_get_global_fee (keys, *merge_timestamp); GNUNET_assert (NULL != gf); + + /* Note: change when flags below changes! */ + if (true) + { + /* If we paid a purse fee, we need to subtract the + purse fee from the reserve history amount */ + TALER_amount_subtract (&ds->reserve_history.amount, + &dr->details.success.purse_value_after_fees, + &gf->fees.purse); + ds->reserve_history.details.merge_details.purse_fee = gf->fees.purse; + } + else + { + ds->reserve_history.amount + = dr->details.success.purse_value_after_fees; + TALER_amount_set_zero ( + ds->reserve_history.amount.currency, + &ds->reserve_history.details.merge_details.purse_fee); + } } -#endif - /* Note: change when flags below changes! */ - TALER_amount_set_zero ( - ds->reserve_history.amount.currency, - &ds->reserve_history.details.merge_details.purse_fee); ds->reserve_history.details.merge_details.h_contract_terms = dr->details.success.h_contract_terms; ds->reserve_history.details.merge_details.merge_pub @@ -234,7 +245,7 @@ deposit_cb (void *cls, ds->reserve_history.details.merge_details.min_age = ds->min_age; ds->reserve_history.details.merge_details.flags - = TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA; + = TALER_WAMF_MODE_CREATE_WITH_PURSE_FEE; ds->purse_complete = true; } } |