diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2022-03-10 01:32:53 +0100 |
|---|---|---|
| committer | Christian Grothoff <grothoff@gnunet.org> | 2022-03-10 01:32:53 +0100 |
| commit | f79857974709fce42d72b147d443872d4c6966e9 (patch) | |
| tree | 22f1cfc21e8561e99c6577fbe0ac6ee141af1248 /src/backend | |
| parent | 09edba887b8f9f82b1c8cc462ff6faed80d387c8 (diff) | |
| download | merchant-f79857974709fce42d72b147d443872d4c6966e9.tar.gz merchant-f79857974709fce42d72b147d443872d4c6966e9.tar.bz2 merchant-f79857974709fce42d72b147d443872d4c6966e9.zip | |
fix #7190: handle new wad fees properly in merchant
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/taler-merchant-httpd_exchanges.c | 3 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-transfers.c | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/backend/taler-merchant-httpd_exchanges.c b/src/backend/taler-merchant-httpd_exchanges.c index 65971eee..be29cfcc 100644 --- a/src/backend/taler-merchant-httpd_exchanges.c +++ b/src/backend/taler-merchant-httpd_exchanges.c @@ -410,8 +410,7 @@ process_wire_fees (struct Exchange *exchange, qs = TMH_db->store_wire_fee_by_exchange (TMH_db->cls, master_pub, &h_wire_method, - &af->fees.wire, - &af->fees.closing, + &af->fees, af->start_date, af->end_date, &af->master_sig); diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c index 83742d01..15efeb3c 100644 --- a/src/backend/taler-merchant-httpd_private-post-transfers.c +++ b/src/backend/taler-merchant-httpd_private-post-transfers.c @@ -380,8 +380,7 @@ check_wire_fee (struct PostTransfersContext *ptc, struct GNUNET_TIME_Timestamp execution_time, const struct TALER_Amount *wire_fee) { - struct TALER_Amount expected_fee; - struct TALER_Amount closing_fee; + struct TALER_WireFeeSet fees; struct TALER_MasterSignatureP master_sig; struct GNUNET_TIME_Timestamp start_date; struct GNUNET_TIME_Timestamp end_date; @@ -393,8 +392,7 @@ check_wire_fee (struct PostTransfersContext *ptc, &ptc->master_pub, wire_method, execution_time, - &expected_fee, - &closing_fee, + &fees, &start_date, &end_date, &master_sig); @@ -421,7 +419,7 @@ check_wire_fee (struct PostTransfersContext *ptc, case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: break; } - if (0 <= TALER_amount_cmp (&expected_fee, + if (0 <= TALER_amount_cmp (&fees.wire, wire_fee)) { GNUNET_free (wire_method); @@ -438,9 +436,11 @@ check_wire_fee (struct PostTransfersContext *ptc, GNUNET_JSON_pack_timestamp ("execution_time", execution_time), TALER_JSON_pack_amount ("expected_wire_fee", - &expected_fee), + &fees.wire), TALER_JSON_pack_amount ("expected_closing_fee", - &closing_fee), + &fees.closing), + TALER_JSON_pack_amount ("expected_wad_fee", + &fees.wad), GNUNET_JSON_pack_timestamp ("start_date", start_date), GNUNET_JSON_pack_timestamp ("end_date", |