Skip to content

Commit b49dcbe

Browse files
committed
update variable naming conventions for IsTrusted
1 parent 5ffe0d1 commit b49dcbe

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/wallet/wallet.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,7 +2299,7 @@ bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain) const
22992299
return IsTrusted(locked_chain, s);
23002300
}
23012301

2302-
bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain, std::set<uint256>& trustedParents) const
2302+
bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain, std::set<uint256>& trusted_parents) const
23032303
{
23042304
// Quick answer in most cases
23052305
if (!locked_chain.checkFinalTx(*tx)) {
@@ -2329,12 +2329,12 @@ bool CWalletTx::IsTrusted(interfaces::Chain::Lock& locked_chain, std::set<uint25
23292329
if (pwallet->IsMine(parentOut) != ISMINE_SPENDABLE)
23302330
return false;
23312331
// If we've already trusted this parent, continue
2332-
if (trustedParents.count(parent->GetHash()))
2332+
if (trusted_parents.count(parent->GetHash()))
23332333
continue;
23342334
// Recurse to check that the parent is also trusted
2335-
if (!parent->IsTrusted(locked_chain, trustedParents))
2335+
if (!parent->IsTrusted(locked_chain, trusted_parents))
23362336
return false;
2337-
trustedParents.insert(parent->GetHash());
2337+
trusted_parents.insert(parent->GetHash());
23382338
}
23392339
return true;
23402340
}
@@ -2420,11 +2420,11 @@ CWallet::Balance CWallet::GetBalance(const int min_depth, bool avoid_reuse) cons
24202420
{
24212421
auto locked_chain = chain().lock();
24222422
LOCK(cs_wallet);
2423-
std::set<uint256> trustedParents;
2423+
std::set<uint256> trusted_parents;
24242424
for (const auto& entry : mapWallet)
24252425
{
24262426
const CWalletTx& wtx = entry.second;
2427-
const bool is_trusted{wtx.IsTrusted(*locked_chain, trustedParents)};
2427+
const bool is_trusted{wtx.IsTrusted(*locked_chain, trusted_parents)};
24282428
const int tx_depth{wtx.GetDepthInMainChain(*locked_chain)};
24292429
const CAmount tx_credit_mine{wtx.GetAvailableCredit(*locked_chain, /* fUseCache */ true, ISMINE_SPENDABLE | reuse_filter)};
24302430
const CAmount tx_credit_watchonly{wtx.GetAvailableCredit(*locked_chain, /* fUseCache */ true, ISMINE_WATCH_ONLY | reuse_filter)};
@@ -2471,7 +2471,7 @@ void CWallet::AvailableCoins(interfaces::Chain::Lock& locked_chain, std::vector<
24712471
const int min_depth = {coinControl ? coinControl->m_min_depth : DEFAULT_MIN_DEPTH};
24722472
const int max_depth = {coinControl ? coinControl->m_max_depth : DEFAULT_MAX_DEPTH};
24732473

2474-
std::set<uint256> trustedParents;
2474+
std::set<uint256> trusted_parents;
24752475
for (const auto& entry : mapWallet)
24762476
{
24772477
const uint256& wtxid = entry.first;
@@ -2493,7 +2493,7 @@ void CWallet::AvailableCoins(interfaces::Chain::Lock& locked_chain, std::vector<
24932493
if (nDepth == 0 && !wtx.InMempool())
24942494
continue;
24952495

2496-
bool safeTx = wtx.IsTrusted(locked_chain, trustedParents);
2496+
bool safeTx = wtx.IsTrusted(locked_chain, trusted_parents);
24972497

24982498
// We should not consider coins from transactions that are replacing
24992499
// other transactions.
@@ -3778,12 +3778,12 @@ std::map<CTxDestination, CAmount> CWallet::GetAddressBalances(interfaces::Chain:
37783778

37793779
{
37803780
LOCK(cs_wallet);
3781-
std::set<uint256> trustedParents;
3781+
std::set<uint256> trusted_parents;
37823782
for (const auto& walletEntry : mapWallet)
37833783
{
37843784
const CWalletTx& wtx = walletEntry.second;
37853785

3786-
if (!wtx.IsTrusted(locked_chain, trustedParents))
3786+
if (!wtx.IsTrusted(locked_chain, trusted_parents))
37873787
continue;
37883788

37893789
if (wtx.IsImmatureCoinBase(locked_chain))

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ class CWalletTx
616616

617617
bool InMempool() const;
618618
bool IsTrusted(interfaces::Chain::Lock& locked_chain) const;
619-
bool IsTrusted(interfaces::Chain::Lock& locked_chain, std::set<uint256>& trustedParents) const;
619+
bool IsTrusted(interfaces::Chain::Lock& locked_chain, std::set<uint256>& trusted_parents) const;
620620

621621
int64_t GetTxTime() const;
622622

0 commit comments

Comments
 (0)