[wallet] factor out GetAvailableWatchOnlyBalance()

jnewbery · jnewbery · commit 0f3d6e9ab758 · 2018-06-28T17:56:59.000-04:00
diff --git 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
@@ -462,7 +462,6 @@ class CWalletTx : public CMerkleTx
     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

Original file line number	Diff line number	Diff line change
`@@ -2026,11 +2026,6 @@ CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool fUseCache) const`
`2026`	`2026`	`return 0;`
`2027`	`2027`	`}`
`2028`	`2028`
`2029`		`-CAmount CWalletTx::GetAvailableWatchOnlyCredit(const bool fUseCache) const`
`2030`		`-{`
`2031`		`- return GetAvailableCredit(fUseCache, ISMINE_WATCH_ONLY);`
`2032`		`-}`
`2033`		`-`
`2034`	`2029`	`CAmount CWalletTx::GetChange() const`
`2035`	`2030`	`{`
`2036`	`2031`	`if (fChangeCached)`
`@@ -2199,7 +2194,7 @@ CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const`
`2199`	`2194`	`{`
`2200`	`2195`	`const CWalletTx* pcoin = &entry.second;`
`2201`	`2196`	`if (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0 && pcoin->InMempool())`
`2202`		`- nTotal += pcoin->GetAvailableWatchOnlyCredit();`
	`2197`	`+ nTotal += pcoin->GetAvailableCredit(true, ISMINE_WATCH_ONLY);`
`2203`	`2198`	`}`
`2204`	`2199`	`}`
`2205`	`2200`	`return nTotal;`