Merge 5241b8bdff into merged_master (Bitcoin PR bitcoin/bitcoin#27368)

This commit is contained in:
Byron Hambly 2025-04-12 10:25:04 +02:00
commit d45c7cba9b

View file

@ -2443,8 +2443,6 @@ arith_uint256 PeerManagerImpl::GetAntiDoSWorkThreshold()
void PeerManagerImpl::HandleFewUnconnectingHeaders(CNode& pfrom, Peer& peer,
const std::vector<CBlockHeader>& headers)
{
const CNetMsgMaker msgMaker(pfrom.GetCommonVersion());
LOCK(cs_main);
CNodeState *nodestate = State(pfrom.GetId());
@ -5004,7 +5002,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