From fac54154660438db6a601584fa91f87bc09395b2 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Mon, 15 Dec 2025 17:16:16 +0100 Subject: [PATCH] refactor: Separate peer/maybe_peer in ProcessMessages and SendMessages Introducing two names to refer to the peer makes it possible to have one refer to a non-null reference in a later commit. --- src/net_processing.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 17f8192cb5c..ebf5dcbc215 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -5186,8 +5186,9 @@ bool PeerManagerImpl::ProcessMessages(CNode& node, std::atomic& interruptM AssertLockHeld(g_msgproc_mutex); CNode* pfrom{&node}; // alias removed in a later commit. - PeerRef peer = GetPeerRef(pfrom->GetId()); - if (peer == nullptr) return false; + PeerRef maybe_peer{GetPeerRef(pfrom->GetId())}; + if (maybe_peer == nullptr) return false; + auto& peer{maybe_peer}; // alias cleaned up in later commit. // For outbound connections, ensure that the initial VERSION message // has been sent first before processing any incoming messages @@ -5689,8 +5690,9 @@ bool PeerManagerImpl::SendMessages(CNode& node) AssertLockHeld(g_msgproc_mutex); CNode* pto{&node}; // alias removed in a later commit - PeerRef peer = GetPeerRef(pto->GetId()); - if (!peer) return false; + PeerRef maybe_peer{GetPeerRef(pto->GetId())}; + if (!maybe_peer) return false; + auto& peer{maybe_peer}; // alias cleaned up in later commit const Consensus::Params& consensusParams = m_chainparams.GetConsensus(); // We must call MaybeDiscourageAndDisconnect first, to ensure that we'll