diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-17 11:59:37 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-12-17 11:59:58 +0100 |
commit | f0913f2f950c7a3e0a14d32216bd6ce4e19d85df (patch) | |
tree | 6626f800607a80332e79eedf7b374e275ae18677 | |
parent | 7ef6b1c51d4a00511a74f6d08abb942a7e433f0b (diff) | |
parent | 0c41c1083089efb158de828f97eb00e206f2869a (diff) | |
download | bitcoin-f0913f2f950c7a3e0a14d32216bd6ce4e19d85df.tar.xz |
Merge #20677: doc: Remove shouty enums in net_processing comments
0c41c1083089efb158de828f97eb00e206f2869a doc: Remove shouty enums in net_processing comments (Suhas Daftuar)
Pull request description:
This uses the `CNode::ConnectionTypeAsString()` strings in place of the all-caps enums in a couple of comments in `net_processing`, as suggested by ajtowns in https://github.com/bitcoin/bitcoin/pull/19858#discussion_r540821050.
ACKs for top commit:
practicalswift:
ACK 0c41c1083089efb158de828f97eb00e206f2869a
jnewbery:
ACK 0c41c1083089efb158de828f97eb00e206f2869a
laanwj:
ACK 0c41c1083089efb158de828f97eb00e206f2869a
Tree-SHA512: c8ab905e151ebb144c3f878277dc59d77591e4b39632658407b69b80b80d65825d5a391b01e2aea6af2fdf174c143dfe7d2f3eba84a020a58d7926458fdcd0a5
-rw-r--r-- | src/net_processing.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index a33c4a0bd4..17aa889ab0 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2394,8 +2394,8 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat // empty and no one will know who we are, so these mechanisms are // important to help us connect to the network. // - // We skip this for BLOCK_RELAY peers to avoid potentially leaking - // information about our BLOCK_RELAY connections via address relay. + // We skip this for block-relay-only peers to avoid potentially leaking + // information about our block-relay-only connections via address relay. if (fListen && !::ChainstateActive().IsInitialBlockDownload()) { CAddress addr = GetLocalAddress(&pfrom.addr, pfrom.GetLocalServices()); @@ -3963,10 +3963,10 @@ void PeerManager::EvictExtraOutboundPeers(int64_t time_in_seconds) }); } - // Check whether we have too many OUTBOUND_FULL_RELAY peers + // Check whether we have too many outbound-full-relay peers if (m_connman.GetExtraFullOutboundCount() > 0) { - // If we have more OUTBOUND_FULL_RELAY peers than we target, disconnect one. - // Pick the OUTBOUND_FULL_RELAY peer that least recently announced + // If we have more outbound-full-relay peers than we target, disconnect one. + // Pick the outbound-full-relay peer that least recently announced // us a new block, with ties broken by choosing the more recent // connection (higher node id) NodeId worst_peer = -1; @@ -3975,7 +3975,7 @@ void PeerManager::EvictExtraOutboundPeers(int64_t time_in_seconds) m_connman.ForEachNode([&](CNode* pnode) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { AssertLockHeld(::cs_main); - // Only consider OUTBOUND_FULL_RELAY peers that are not already + // Only consider outbound-full-relay peers that are not already // marked for disconnection if (!pnode->IsFullOutboundConn() || pnode->fDisconnect) return; CNodeState *state = State(pnode->GetId()); |