diff options
| author | furszy <matiasfurszyfer@protonmail.com> | 2022-05-24 12:29:51 -0300 |
|---|---|---|
| committer | furszy <matiasfurszyfer@protonmail.com> | 2022-07-08 11:18:35 -0300 |
| commit | 198fcca162f4d2f877feab485e629ff89818ff56 (patch) | |
| tree | c2d761c60589b323f811883963853326e421718d /src/wallet/test | |
| parent | 7a45c33d1f8a758850cf8e7bd6ad508939ba5c0d (diff) | |
| download | bitcoin-198fcca162f4d2f877feab485e629ff89818ff56.tar.xz | |
wallet: refactor, include 'FeeCalculation' inside 'CreatedTransactionResult'
Diffstat (limited to 'src/wallet/test')
| -rw-r--r-- | src/wallet/test/spend_tests.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/test/wallet_tests.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp index bdc148afb4..435c139170 100644 --- a/src/wallet/test/spend_tests.cpp +++ b/src/wallet/test/spend_tests.cpp @@ -34,8 +34,7 @@ BOOST_FIXTURE_TEST_CASE(SubtractFee, TestChain100Setup) coin_control.fOverrideFeeRate = true; // We need to use a change type with high cost of change so that the leftover amount will be dropped to fee instead of added as a change output coin_control.m_change_type = OutputType::LEGACY; - FeeCalculation fee_calc; - std::optional<CreatedTransactionResult> txr = CreateTransaction(*wallet, {recipient}, RANDOM_CHANGE_POSITION, error, coin_control, fee_calc); + std::optional<CreatedTransactionResult> txr = CreateTransaction(*wallet, {recipient}, RANDOM_CHANGE_POSITION, error, coin_control); BOOST_CHECK(txr.has_value()); BOOST_CHECK_EQUAL(txr->tx->vout.size(), 1); BOOST_CHECK_EQUAL(txr->tx->vout[0].nValue, recipient.nAmount + leftover_input_amount - txr->fee); diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 0c03b2f4a2..9ed840031d 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -4,7 +4,6 @@ #include <wallet/wallet.h> -#include <any> #include <future> #include <memory> #include <stdint.h> @@ -13,7 +12,6 @@ #include <interfaces/chain.h> #include <key_io.h> #include <node/blockstorage.h> -#include <node/context.h> #include <policy/policy.h> #include <rpc/server.h> #include <test/util/logging.h> @@ -523,10 +521,9 @@ public: CTransactionRef tx; bilingual_str error; CCoinControl dummy; - FeeCalculation fee_calc_out; { constexpr int RANDOM_CHANGE_POSITION = -1; - std::optional<CreatedTransactionResult> txr = CreateTransaction(*wallet, {recipient}, RANDOM_CHANGE_POSITION, error, dummy, fee_calc_out); + std::optional<CreatedTransactionResult> txr = CreateTransaction(*wallet, {recipient}, RANDOM_CHANGE_POSITION, error, dummy); BOOST_CHECK(txr.has_value()); tx = txr->tx; } |