p2p: Avoid an IsAncestorOfBestHeaderOrTip call

sipa · danielabrozzoni · commit 0bf6139e194f · 2025-11-03T03:51:05.000+01:00
Just don't call this function when it won't have any effect.

Note that we can't remove the LookupBlockIndex call, since `last_received_header`
is needed to check if new headers were received (`received_new_header`).
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2919,9 +2919,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, Peer& peer,
     {
         LOCK(cs_main);
         last_received_header = m_chainman.m_blockman.LookupBlockIndex(headers.back().GetHash());
-        if (IsAncestorOfBestHeaderOrTip(last_received_header)) {
-            already_validated_work = true;
-        }
+        already_validated_work = already_validated_work || IsAncestorOfBestHeaderOrTip(last_received_header);
     }
 
     // If our peer has NetPermissionFlags::NoBan privileges, then bypass our

Original file line number	Diff line number	Diff line change
`@@ -2919,9 +2919,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, Peer& peer,`
`2919`	`2919`	`{`
`2920`	`2920`	`LOCK(cs_main);`
`2921`	`2921`	`last_received_header = m_chainman.m_blockman.LookupBlockIndex(headers.back().GetHash());`
`2922`		`- if (IsAncestorOfBestHeaderOrTip(last_received_header)) {`
`2923`		`- already_validated_work = true;`
`2924`		`- }`
	`2922`	`+ already_validated_work = already_validated_work \|\| IsAncestorOfBestHeaderOrTip(last_received_header);`
`2925`	`2923`	`}`
`2926`	`2924`
`2927`	`2925`	`// If our peer has NetPermissionFlags::NoBan privileges, then bypass our`