LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[wallet] Factor out GetWatchOnlyBalance()

Browse source
This commit is contained in:
John Newbery 2018-06-27 13:43:25 -04:00
parent 4279da4785
commit ef7bc8893c
3 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/wallet.cpp
View file

@ -339,7 +339,7 @@ public:
result.immature_balance = m_wallet.GetImmatureBalance(); result.immature_balance = m_wallet.GetImmatureBalance();
result.have_watch_only = m_wallet.HaveWatchOnly(); result.have_watch_only = m_wallet.HaveWatchOnly();
if (result.have_watch_only) { if (result.have_watch_only) {
result.watch_only_balance = m_wallet.GetWatchOnlyBalance(); result.watch_only_balance = m_wallet.GetBalance(ISMINE_WATCH_ONLY);
result.unconfirmed_watch_only_balance = m_wallet.GetUnconfirmedWatchOnlyBalance(); result.unconfirmed_watch_only_balance = m_wallet.GetUnconfirmedWatchOnlyBalance();
result.immature_watch_only_balance = m_wallet.GetImmatureWatchOnlyBalance(); result.immature_watch_only_balance = m_wallet.GetImmatureWatchOnlyBalance();
} }

16
src/wallet/wallet.cpp
View file

@ -2211,22 +2211,6 @@ CAmount CWallet::GetImmatureBalance() const
return nTotal; return nTotal;
} }
CAmount CWallet::GetWatchOnlyBalance() const
{
CAmount nTotal = 0;
{
LOCK2(cs_main, cs_wallet);
for (const auto& entry : mapWallet)
{
const CWalletTx* pcoin = &entry.second;
if (pcoin->IsTrusted())
nTotal += pcoin->GetAvailableWatchOnlyCredit();
}
}
return nTotal;
}
CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const CAmount CWallet::GetUnconfirmedWatchOnlyBalance() const
{ {
CAmount nTotal = 0; CAmount nTotal = 0;

1
src/wallet/wallet.h
View file

@ -947,7 +947,6 @@ public:
CAmount GetBalance(const isminefilter& filter=ISMINE_SPENDABLE) const; CAmount GetBalance(const isminefilter& filter=ISMINE_SPENDABLE) const;
CAmount GetUnconfirmedBalance() const; CAmount GetUnconfirmedBalance() const;
CAmount GetImmatureBalance() const; CAmount GetImmatureBalance() const;
CAmount GetWatchOnlyBalance() const;
CAmount GetUnconfirmedWatchOnlyBalance() const; CAmount GetUnconfirmedWatchOnlyBalance() const;
CAmount GetImmatureWatchOnlyBalance() const; CAmount GetImmatureWatchOnlyBalance() const;
CAmount GetLegacyBalance(const isminefilter& filter, int minDepth, const std::string* account) const; CAmount GetLegacyBalance(const isminefilter& filter, int minDepth, const std::string* account) const;