aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-03-15 14:33:33 +0900
committerKarl-Johan Alm <karljohan-alm@garage.co.jp>2018-07-24 15:05:38 +0900
commit43e04d13b1ffc02b1082176e87f420198b40c7b1 (patch)
treeb204fcb0ce6e9edacd6ae5da913c043605582844
parent0128121101fb3ee82f3abd3973a967a4226ffe0e (diff)
downloadbitcoin-43e04d13b1ffc02b1082176e87f420198b40c7b1.tar.xz
wallet: Remove deprecated OutputEligibleForSpending
-rw-r--r--src/wallet/wallet.cpp17
-rw-r--r--src/wallet/wallet.h3
2 files changed, 0 insertions, 20 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 3c7e3302fb..e6c513a531 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2414,23 +2414,6 @@ const CTxOut& CWallet::FindNonChangeParentOutput(const CTransaction& tx, int out
return ptx->vout[n];
}
-bool CWallet::OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const
-{
- if (!output.fSpendable)
- return false;
-
- if (output.nDepth < (output.tx->IsFromMe(ISMINE_ALL) ? eligibility_filter.conf_mine : eligibility_filter.conf_theirs))
- return false;
-
- size_t ancestors, descendants;
- mempool.GetTransactionAncestry(output.tx->GetHash(), ancestors, descendants);
- if (ancestors > eligibility_filter.max_ancestors || descendants > eligibility_filter.max_descendants) {
- return false;
- }
-
- return true;
-}
-
bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const CoinEligibilityFilter& eligibility_filter, std::vector<OutputGroup> groups,
std::set<CInputCoin>& setCoinsRet, CAmount& nValueRet, const CoinSelectionParams& coin_selection_params, bool& bnb_used) const
{
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 6c8063c47c..122649d575 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1188,9 +1188,6 @@ public:
*/
void LearnAllRelatedScripts(const CPubKey& key);
- /** Whether a given output is spendable by this wallet */
- bool OutputEligibleForSpending(const COutput& output, const CoinEligibilityFilter& eligibility_filter) const;
-
/** set a single wallet flag */
void SetWalletFlag(uint64_t flags);