diff options
author | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:44:55 +0100 |
---|---|---|
committer | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:50:31 +0100 |
commit | f4f502d037a84a38db4bc21a1db06324a05d26aa (patch) | |
tree | abd1d813c9e1a9303d60edd3600a9e39f9d3d91a /src/auditor/taler-helper-auditor-aggregation.c | |
parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
download | exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.tar.xz |
-minor merge conflict resolves
Diffstat (limited to 'src/auditor/taler-helper-auditor-aggregation.c')
-rw-r--r-- | src/auditor/taler-helper-auditor-aggregation.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c index 7fffcd284..0b6f6557b 100644 --- a/src/auditor/taler-helper-auditor-aggregation.c +++ b/src/auditor/taler-helper-auditor-aggregation.c @@ -471,7 +471,7 @@ check_transaction_history_for_deposit ( /* Fee according to denomination data of auditor */ TALER_amount_ntoh (&fee_expected, - &issue->fee_deposit); + &issue->fees.deposit); if (0 != TALER_amount_cmp (&fee_expected, fee_claimed)) @@ -496,7 +496,7 @@ check_transaction_history_for_deposit ( struct TALER_Amount fee_expected; TALER_amount_ntoh (&fee_expected, - &issue->fee_refresh); + &issue->fees.refresh); if (0 != TALER_amount_cmp (&fee_expected, fee_claimed)) @@ -540,7 +540,7 @@ check_transaction_history_for_deposit ( struct TALER_Amount fee_expected; TALER_amount_ntoh (&fee_expected, - &issue->fee_refund); + &issue->fees.refund); if (0 != TALER_amount_cmp (&fee_expected, fee_claimed)) |