Skip to content

Commit 9d00406

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24677: refactor: fix wallet and related named args
21db4eb test: fix incorrect named args in wallet tests (fanquake) 8b0e776 test: fix incorrect named args in coin_selection tests (fanquake) 6fc00f7 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 bitcoin/bitcoin#22979. > To allow them being checked by clang-tidy, use a format it can understand. ACKs for top commit: MarcoFalke: Concept ACK 21db4eb Tree-SHA512: c29743a70f6118cf73dc37b56b30f45da55b7d7b3b8ed36859ad59f602c3e6692eb755e05d9a4dd17f05085bcd6cb5b8c4007090a76e4fbfb053f925322cf985
2 parents a13946b + 21db4eb commit 9d00406

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎src/bench/coin_selection.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ static void CoinSelection(benchmark::Bench& bench)
5858
// Create coins
5959
std::vector<COutput> coins;
6060
for (const auto& wtx : wtxs) {
61-
coins.emplace_back(COutPoint(wtx->GetHash(), 0), wtx->tx->vout.at(0), /*depth=*/ 6 * 24, GetTxSpendSize(wallet, *wtx, 0), /*spendable=*/ true, /*solvable=*/ true, /*safe=*/ true, wtx->GetTxTime(), /*from_me=*/ true);
61+
coins.emplace_back(COutPoint(wtx->GetHash(), 0), wtx->tx->vout.at(0), /*depth=*/6 * 24, GetTxSpendSize(wallet, *wtx, 0), /*spendable=*/true, /*solvable=*/true, /*safe=*/true, wtx->GetTxTime(), /*from_me=*/true);
6262
}
6363

6464
const CoinEligibilityFilter filter_standard(1, 6, 0);
6565
FastRandomContext rand{};
6666
const CoinSelectionParams coin_selection_params{
6767
rand,
68-
/* change_output_size= */ 34,
69-
/* change_spend_size= */ 148,
68+
/*change_output_size=*/ 34,
69+
/*change_spend_size=*/ 148,
7070
/*min_change_target=*/ CHANGE_LOWER,
71-
/* effective_feerate= */ CFeeRate(0),
72-
/* long_term_feerate= */ CFeeRate(0),
73-
/* discard_feerate= */ CFeeRate(0),
74-
/* tx_noinputs_size= */ 0,
75-
/* avoid_partial= */ false,
71+
/*effective_feerate=*/ CFeeRate(0),
72+
/*long_term_feerate=*/ CFeeRate(0),
73+
/*discard_feerate=*/ CFeeRate(0),
74+
/*tx_noinputs_size=*/ 0,
75+
/*avoid_partial=*/ false,
7676
};
7777
bench.run([&] {
7878
auto result = AttemptSelection(wallet, 1003 * COIN, filter_standard, coins, coin_selection_params);

‎src/wallet/test/coinselector_tests.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ inline std::vector<OutputGroup>& KnapsackGroupOutputs(const std::vector<COutput>
148148
FastRandomContext rand{};
149149
CoinSelectionParams coin_selection_params{
150150
rand,
151-
/* change_output_size= */ 0,
152-
/* change_spend_size= */ 0,
151+
/*change_output_size=*/ 0,
152+
/*change_spend_size=*/ 0,
153153
/*min_change_target=*/ CENT,
154-
/* effective_feerate= */ CFeeRate(0),
155-
/* long_term_feerate= */ CFeeRate(0),
156-
/* discard_feerate= */ CFeeRate(0),
157-
/* tx_noinputs_size= */ 0,
158-
/* avoid_partial= */ false,
154+
/*effective_feerate=*/ CFeeRate(0),
155+
/*long_term_feerate=*/ CFeeRate(0),
156+
/*discard_feerate=*/ CFeeRate(0),
157+
/*tx_noinputs_size=*/ 0,
158+
/*avoid_partial=*/ false,
159159
};
160160
static std::vector<OutputGroup> static_groups;
161161
static_groups = GroupOutputs(wallet, coins, coin_selection_params, filter, /*positive_only=*/false);
@@ -293,14 +293,14 @@ BOOST_AUTO_TEST_CASE(bnb_search_test)
293293
// Make sure that effective value is working in AttemptSelection when BnB is used
294294
CoinSelectionParams coin_selection_params_bnb{
295295
rand,
296-
/* change_output_size= */ 0,
297-
/* change_spend_size= */ 0,
296+
/*change_output_size=*/ 0,
297+
/*change_spend_size=*/ 0,
298298
/*min_change_target=*/ 0,
299-
/* effective_feerate= */ CFeeRate(3000),
300-
/* long_term_feerate= */ CFeeRate(1000),
301-
/* discard_feerate= */ CFeeRate(1000),
302-
/* tx_noinputs_size= */ 0,
303-
/* avoid_partial= */ false,
299+
/*effective_feerate=*/ CFeeRate(3000),
300+
/*long_term_feerate=*/ CFeeRate(1000),
301+
/*discard_feerate=*/ CFeeRate(1000),
302+
/*tx_noinputs_size=*/ 0,
303+
/*avoid_partial=*/ false,
304304
};
305305
{
306306
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)
717717
// Perform selection
718718
CoinSelectionParams cs_params{
719719
rand,
720-
/* change_output_size= */ 34,
721-
/* change_spend_size= */ 148,
720+
/*change_output_size=*/ 34,
721+
/*change_spend_size=*/ 148,
722722
/*min_change_target=*/ CENT,
723-
/* effective_feerate= */ CFeeRate(0),
724-
/* long_term_feerate= */ CFeeRate(0),
725-
/* discard_feerate= */ CFeeRate(0),
726-
/* tx_noinputs_size= */ 0,
727-
/* avoid_partial= */ false,
723+
/*effective_feerate=*/ CFeeRate(0),
724+
/*long_term_feerate=*/ CFeeRate(0),
725+
/*discard_feerate=*/ CFeeRate(0),
726+
/*tx_noinputs_size=*/ 0,
727+
/*avoid_partial=*/ false,
728728
};
729729
CCoinControl cc;
730730
const auto result = SelectCoins(*wallet, coins, target, cc, cs_params);

‎src/wallet/test/wallet_tests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
339339
BOOST_FIXTURE_TEST_CASE(coin_mark_dirty_immature_credit, TestChain100Setup)
340340
{
341341
CWallet wallet(m_node.chain.get(), "", m_args, CreateDummyWalletDatabase());
342-
CWalletTx wtx{m_coinbase_txns.back(), TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*position_in_block=*/0}};
342+
CWalletTx wtx{m_coinbase_txns.back(), TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*index=*/0}};
343343

344344
LOCK(wallet.cs_wallet);
345345
wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
@@ -373,7 +373,7 @@ static int64_t AddTx(ChainstateManager& chainman, CWallet& wallet, uint32_t lock
373373
block = &inserted.first->second;
374374
block->nTime = blockTime;
375375
block->phashBlock = &hash;
376-
state = TxStateConfirmed{hash, block->nHeight, /*position_in_block=*/0};
376+
state = TxStateConfirmed{hash, block->nHeight, /*index=*/0};
377377
}
378378
return wallet.AddToWallet(MakeTransactionRef(tx), state, [&](CWalletTx& wtx, bool /* new_tx */) {
379379
// Assign wtx.m_state to simplify test and avoid the need to simulate
@@ -540,7 +540,7 @@ class ListCoinsTestingSetup : public TestChain100Setup
540540
wallet->SetLastBlockProcessed(wallet->GetLastBlockHeight() + 1, m_node.chainman->ActiveChain().Tip()->GetBlockHash());
541541
auto it = wallet->mapWallet.find(tx->GetHash());
542542
BOOST_CHECK(it != wallet->mapWallet.end());
543-
it->second.m_state = TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*position_in_block=*/1};
543+
it->second.m_state = TxStateConfirmed{m_node.chainman->ActiveChain().Tip()->GetBlockHash(), m_node.chainman->ActiveChain().Height(), /*index=*/1};
544544
return it->second;
545545
}
546546

0 commit comments

Comments
 (0)