Skip to content

Commit 96c2c95

Browse files
committed
scripted-diff: Rename SelectCoinsMinConf to AttemptSelection
SelectCoinsMinConf is a bit of a misnomer now since it really just does all of the coin selection given some parameters. So rename this to something less annoying to say and makes a bit more sense. -BEGIN VERIFY SCRIPT- sed -i 's/SelectCoinsMinConf/AttemptSelection/g' $(git grep -l SelectCoinsMinConf ./src) -END VERIFY SCRIPT-
1 parent b583f73 commit 96c2c95

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

src/bench/coin_selection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void CoinSelection(benchmark::Bench& bench)
5656
bench.run([&] {
5757
std::set<CInputCoin> setCoinsRet;
5858
CAmount nValueRet;
59-
bool success = wallet.SelectCoinsMinConf(1003 * COIN, filter_standard, coins, setCoinsRet, nValueRet, coin_selection_params);
59+
bool success = wallet.AttemptSelection(1003 * COIN, filter_standard, coins, setCoinsRet, nValueRet, coin_selection_params);
6060
assert(success);
6161
assert(nValueRet == 1003 * COIN);
6262
assert(setCoinsRet.size() == 2);

src/wallet/spend.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ std::vector<OutputGroup> CWallet::GroupOutputs(const std::vector<COutput>& outpu
352352
return groups_out;
353353
}
354354

355-
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> coins,
355+
bool CWallet::AttemptSelection(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<COutput> coins,
356356
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params) const
357357
{
358358
setCoinsRet.clear();
@@ -456,40 +456,40 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
456456

457457
// If possible, fund the transaction with confirmed UTXOs only. Prefer at least six
458458
// confirmations on outputs received from other wallets and only spend confirmed change.
459-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(1, 6, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
460-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(1, 1, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
459+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(1, 6, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
460+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(1, 1, 0), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
461461

462462
// Fall back to using zero confirmation change (but with as few ancestors in the mempool as
463463
// possible) if we cannot fund the transaction otherwise.
464464
if (m_spend_zero_conf_change) {
465-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(0, 1, 2), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
466-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(0, 1, std::min((size_t)4, max_ancestors/3), std::min((size_t)4, max_descendants/3)),
465+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(0, 1, 2), vCoins, setCoinsRet, nValueRet, coin_selection_params)) return true;
466+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(0, 1, std::min((size_t)4, max_ancestors/3), std::min((size_t)4, max_descendants/3)),
467467
vCoins, setCoinsRet, nValueRet, coin_selection_params)) {
468468
return true;
469469
}
470-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(0, 1, max_ancestors/2, max_descendants/2),
470+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(0, 1, max_ancestors/2, max_descendants/2),
471471
vCoins, setCoinsRet, nValueRet, coin_selection_params)) {
472472
return true;
473473
}
474474
// If partial groups are allowed, relax the requirement of spending OutputGroups (groups
475475
// of UTXOs sent to the same address, which are obviously controlled by a single wallet)
476476
// in their entirety.
477-
if (SelectCoinsMinConf(value_to_select, CoinEligibilityFilter(0, 1, max_ancestors-1, max_descendants-1, true /* include_partial_groups */),
477+
if (AttemptSelection(value_to_select, CoinEligibilityFilter(0, 1, max_ancestors-1, max_descendants-1, true /* include_partial_groups */),
478478
vCoins, setCoinsRet, nValueRet, coin_selection_params)) {
479479
return true;
480480
}
481481
// Try with unsafe inputs if they are allowed. This may spend unconfirmed outputs
482482
// received from other wallets.
483483
if (coin_control.m_include_unsafe_inputs
484-
&& SelectCoinsMinConf(value_to_select,
484+
&& AttemptSelection(value_to_select,
485485
CoinEligibilityFilter(0 /* conf_mine */, 0 /* conf_theirs */, max_ancestors-1, max_descendants-1, true /* include_partial_groups */),
486486
vCoins, setCoinsRet, nValueRet, coin_selection_params)) {
487487
return true;
488488
}
489489
// Try with unlimited ancestors/descendants. The transaction will still need to meet
490490
// mempool ancestor/descendant policy to be accepted to mempool and broadcasted, but
491491
// OutputGroups use heuristics that may overestimate ancestor/descendant counts.
492-
if (!fRejectLongChains && SelectCoinsMinConf(value_to_select,
492+
if (!fRejectLongChains && AttemptSelection(value_to_select,
493493
CoinEligibilityFilter(0, 1, std::numeric_limits<uint64_t>::max(), std::numeric_limits<uint64_t>::max(), true /* include_partial_groups */),
494494
vCoins, setCoinsRet, nValueRet, coin_selection_params)) {
495495
return true;
@@ -499,7 +499,7 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm
499499
return false;
500500
}();
501501

502-
// SelectCoinsMinConf clears setCoinsRet, so add the preset inputs from coin_control to the coinset
502+
// AttemptSelection clears setCoinsRet, so add the preset inputs from coin_control to the coinset
503503
util::insert(setCoinsRet, setPresetCoins);
504504

505505
// add preset inputs to the total value selected

0 commit comments

Comments
 (0)