Skip to content

Commit 9c47cb2

Browse files
committed
[Rename only] Rename orphan_work_set to m_orphan_work_set.
This helps distinguish the member from any local variables.
1 parent ec0453c commit 9c47cb2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/net.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ class CNode
10421042
// Whether a ping is requested.
10431043
std::atomic<bool> fPingQueued{false};
10441044

1045-
std::set<uint256> orphan_work_set;
1045+
std::set<uint256> m_orphan_work_set;
10461046

10471047
CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const CAddress &addrBindIn, const std::string &addrNameIn, ConnectionType conn_type_in, bool inbound_onion = false);
10481048
~CNode();

src/net_processing.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3052,7 +3052,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat
30523052
auto it_by_prev = mapOrphanTransactionsByPrev.find(COutPoint(txid, i));
30533053
if (it_by_prev != mapOrphanTransactionsByPrev.end()) {
30543054
for (const auto& elem : it_by_prev->second) {
3055-
pfrom.orphan_work_set.insert(elem->first);
3055+
pfrom.m_orphan_work_set.insert(elem->first);
30563056
}
30573057
}
30583058
}
@@ -3069,7 +3069,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat
30693069
}
30703070

30713071
// Recursively process any orphan transactions that depended on this one
3072-
ProcessOrphanTx(pfrom.orphan_work_set);
3072+
ProcessOrphanTx(pfrom.m_orphan_work_set);
30733073
}
30743074
else if (state.GetResult() == TxValidationResult::TX_MISSING_INPUTS)
30753075
{
@@ -3868,9 +3868,9 @@ bool PeerManager::ProcessMessages(CNode* pfrom, std::atomic<bool>& interruptMsgP
38683868
if (!pfrom->vRecvGetData.empty())
38693869
ProcessGetData(*pfrom, m_chainparams, m_connman, m_mempool, interruptMsgProc);
38703870

3871-
if (!pfrom->orphan_work_set.empty()) {
3871+
if (!pfrom->m_orphan_work_set.empty()) {
38723872
LOCK2(cs_main, g_cs_orphans);
3873-
ProcessOrphanTx(pfrom->orphan_work_set);
3873+
ProcessOrphanTx(pfrom->m_orphan_work_set);
38743874
}
38753875

38763876
if (pfrom->fDisconnect)
@@ -3879,7 +3879,7 @@ bool PeerManager::ProcessMessages(CNode* pfrom, std::atomic<bool>& interruptMsgP
38793879
// this maintains the order of responses
38803880
// and prevents vRecvGetData to grow unbounded
38813881
if (!pfrom->vRecvGetData.empty()) return true;
3882-
if (!pfrom->orphan_work_set.empty()) return true;
3882+
if (!pfrom->m_orphan_work_set.empty()) return true;
38833883

38843884
// Don't bother if send buffer is too full to respond anyway
38853885
if (pfrom->fPauseSend)

0 commit comments

Comments
 (0)