From 0f3d6e9ab75837ead3acfda342aa3ea404efb81d Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 27 Jun 2018 11:53:08 -0400 Subject: [PATCH] [wallet] factor out GetAvailableWatchOnlyBalance() --- src/wallet/wallet.cpp | 7 +------ src/wallet/wallet.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 4d3263671..1038416fe 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2026,11 +2026,6 @@ CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool fUseCache) const return 0; } -CAmount CWalletTx::GetAvailableWatchOnlyCredit(const bool fUseCache) const -{ - return GetAvailableCredit(fUseCache, ISMINE_WATCH_ONLY); -} - CAmount CWalletTx::GetChange() const { if (fChangeCached) @@ -2199,7 +2194,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const { const CWalletTx* pcoin = &entry.second; if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool()) - nTotal += pcoin->GetAvailableWatchOnlyCredit(); + nTotal += pcoin->GetAvailableCredit(true, ISMINE_WATCH_ONLY); } } return nTotal; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 4cb881bc4..bc70ffc59 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -462,7 +462,6 @@ public: CAmount GetImmatureCredit(bool fUseCache=true) const; CAmount GetAvailableCredit(bool fUseCache=true, const isminefilter& filter=ISMINE_SPENDABLE) const; CAmount GetImmatureWatchOnlyCredit(const bool fUseCache=true) const; - CAmount GetAvailableWatchOnlyCredit(const bool fUseCache=true) const; CAmount GetChange() const; // Get the marginal bytes if spending the specified output from this transaction