aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2022-03-28 14:56:40 +0200
committerMarcoFalke <falke.marco@gmail.com>2022-03-28 14:56:46 +0200
commit9d00406dc99563a41e75c66cc70f9b7f4157f425 (patch)
tree1dbccc3628580ee766da52db6f78ce62eb9165ac /src/wallet
parenta13946b8227dac191e33eb2099230457e786e5cc (diff)
parent21db4eb3ff481334e0fdf4724f853556f6a0028f (diff)
Merge bitcoin/bitcoin#24677: refactor: fix wallet and related named args
21db4eb3ff481334e0fdf4724f853556f6a0028f test: fix incorrect named args in wallet tests (fanquake) 8b0e776718f32cecfd2898d003510969276507a6 test: fix incorrect named args in coin_selection tests (fanquake) 6fc00f7331f2f926167de107a30b31e895fa26f5 bench: fix incorrect named args in coin_selection bench (fanquake) Pull request description: Should be one of the last changes split from #24661. Motivation: > Incorrect named args are source of bugs, like https://github.com/bitcoin/bitcoin/pull/22979. > To allow them being checked by clang-tidy, use a format it can understand. ACKs for top commit: MarcoFalke: Concept ACK 21db4eb3ff481334e0fdf4724f853556f6a0028f Tree-SHA512: c29743a70f6118cf73dc37b56b30f45da55b7d7b3b8ed36859ad59f602c3e6692eb755e05d9a4dd17f05085bcd6cb5b8c4007090a76e4fbfb053f925322cf985
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/test/coinselector_tests.cpp42
-rw-r--r--src/wallet/test/wallet_tests.cpp6
2 files changed, 24 insertions, 24 deletions
diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp
index 87ce18c8c9..2a08c8ab57 100644
--- a/src/wallet/test/coinselector_tests.cpp
+++ b/src/wallet/test/coinselector_tests.cpp
@@ -148,14 +148,14 @@ inline std::vector<OutputGroup>& KnapsackGroupOutputs(const std::vector<COutput>
FastRandomContext rand{};
CoinSelectionParams coin_selection_params{
rand,
- /* change_output_size= */ 0,
- /* change_spend_size= */ 0,
+ /*change_output_size=*/ 0,
+ /*change_spend_size=*/ 0,
/*min_change_target=*/ CENT,
- /* effective_feerate= */ CFeeRate(0),
- /* long_term_feerate= */ CFeeRate(0),
- /* discard_feerate= */ CFeeRate(0),
- /* tx_noinputs_size= */ 0,
- /* avoid_partial= */ false,
+ /*effective_feerate=*/ CFeeRate(0),
+ /*long_term_feerate=*/ CFeeRate(0),
+ /*discard_feerate=*/ CFeeRate(0),
+ /*tx_noinputs_size=*/ 0,
+ /*avoid_partial=*/ false,
};
static std::vector<OutputGroup> static_groups;
static_groups = GroupOutputs(wallet, coins, coin_selection_params, filter, /*positive_only=*/false);
@@ -293,14 +293,14 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
// Make sure that effective value is working in AttemptSelection when BnB is used
CoinSelectionParams coin_selection_params_bnb{
rand,
- /* change_output_size= */ 0,
- /* change_spend_size= */ 0,
+ /*change_output_size=*/ 0,
+ /*change_spend_size=*/ 0,
/*min_change_target=*/ 0,
- /* effective_feerate= */ CFeeRate(3000),
- /* long_term_feerate= */ CFeeRate(1000),
- /* discard_feerate= */ CFeeRate(1000),
- /* tx_noinputs_size= */ 0,
- /* avoid_partial= */ false,
+ /*effective_feerate=*/ CFeeRate(3000),
+ /*long_term_feerate=*/ CFeeRate(1000),
+ /*discard_feerate=*/ CFeeRate(1000),
+ /*tx_noinputs_size=*/ 0,
+ /*avoid_partial=*/ false,
};
{
std::unique_ptr<CWallet> wallet = std::make_unique<CWallet>(m_node.chain.get(), "", m_args, CreateMockWalletDatabase());
@@ -717,14 +717,14 @@ BOOST_AUTO_TEST_CASE(SelectCoins_test)
// Perform selection
CoinSelectionParams cs_params{
rand,
- /* change_output_size= */ 34,
- /* change_spend_size= */ 148,
+ /*change_output_size=*/ 34,
+ /*change_spend_size=*/ 148,
/*min_change_target=*/ CENT,
- /* effective_feerate= */ CFeeRate(0),
- /* long_term_feerate= */ CFeeRate(0),
- /* discard_feerate= */ CFeeRate(0),
- /* tx_noinputs_size= */ 0,
- /* avoid_partial= */ false,
+ /*effective_feerate=*/ CFeeRate(0),
+ /*long_term_feerate=*/ CFeeRate(0),
+ /*discard_feerate=*/ CFeeRate(0),
+ /*tx_noinputs_size=*/ 0,
+ /*avoid_partial=*/ false,
};
CCoinControl cc;
const auto result = SelectCoins(*wallet, coins, target, cc, cs_params);
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index c1fa2c3c60..5518f4fdae 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -339,7 +339,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
BOOST_FIXTURE_TEST_CASE(coin_mark_dirty_immature_credit, TestChain100Setup)
{
CWallet wallet(m_node.chain.get(), "", m_args, CreateDummyWalletDatabase());
- CWalletTx wtx{m_coinbase_txns.back(), TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*position_in_block=*/0}};
+ CWalletTx wtx{m_coinbase_txns.back(), TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*index=*/0}};
LOCK(wallet.cs_wallet);
wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
@@ -373,7 +373,7 @@ static int64_t AddTx(ChainstateManager& chainman, CWallet& wallet, uint32_t lock
block = &inserted.first->second;
block->nTime = blockTime;
block->phashBlock = &hash;
- state = TxStateConfirmed{hash, block->nHeight, /*position_in_block=*/0};
+ state = TxStateConfirmed{hash, block->nHeight, /*index=*/0};
}
return wallet.AddToWallet(MakeTransactionRef(tx), state, [&](CWalletTx& wtx, bool /* new_tx */) {
// Assign wtx.m_state to simplify test and avoid the need to simulate
@@ -540,7 +540,7 @@ public:
wallet->SetLastBlockProcessed(wallet->GetLastBlockHeight() + 1, m_node.chainman->ActiveChain().Tip()->GetBlockHash());
auto it = wallet->mapWallet.find(tx->GetHash());
BOOST_CHECK(it != wallet->mapWallet.end());
- it->second.m_state = TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*position_in_block=*/1};
+ it->second.m_state = TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*index=*/1};
return it->second;
}