From 671e8e68510a474da84bb7a9f394258f49eefb1a Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 30 Mar 2023 13:38:13 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#27368: refactor: Drop no longer used `CNetMsgMaker` instances ea7ec7808745805c0a18513d7da271dedb2de3f1 refactor: Drop no longer used `CNetMsgMaker` instances (Hennadii Stepanov) Pull request description: The removed lines have been unused since the https://github.com/bitcoin/bitcoin/commit/abf5d16c24cb08b0451bdbd4d1de63a12930e8f5 commit from https://github.com/bitcoin/bitcoin/pull/25454. ACKs for top commit: dergoegge: utACK ea7ec7808745805c0a18513d7da271dedb2de3f1 Sjors: ACK ea7ec7808745805c0a18513d7da271dedb2de3f1 TheCharlatan: ACK ea7ec7808745805c0a18513d7da271dedb2de3f1 Tree-SHA512: 9a2a9ff3f124b68a8cd20a637e90885096996c3aa354a4d8adbec98f5761e9e826c1c064ccd90aaf6d72beac61dd9e22c8b76d089e18bba6e0ad51e59a9c7df8 --- src/net_processing.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index e0af64376b..e570a09b7a 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2773,8 +2773,6 @@ void PeerManagerImpl::SendBlockTransactions(CNode& pfrom, const CBlock& block, c void PeerManagerImpl::HandleFewUnconnectingHeaders(CNode& pfrom, Peer& peer, const std::vector& headers) { - const CNetMsgMaker msgMaker(pfrom.GetCommonVersion()); - LOCK(cs_main); CNodeState *nodestate = State(pfrom.GetId()); @@ -5165,7 +5163,6 @@ void PeerManagerImpl::ConsiderEviction(CNode& pto, Peer& peer, std::chrono::seco AssertLockHeld(cs_main); CNodeState &state = *State(pto.GetId()); - const CNetMsgMaker msgMaker(pto.GetCommonVersion()); if (!state.m_chain_sync.m_protect && pto.IsOutboundOrBlockRelayConn() && state.fSyncStarted) { // This is an outbound peer subject to disconnection if they don't