eth/protocols/eth,p2p/discover: remove unnecessary checks (ethereum#29590)

undefinedor · jorgemmsilva · commit f1a2580096ef · 2024-06-17T13:52:02.000+01:00
fix useless condition
diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go
@@ -190,7 +190,7 @@ func serviceContiguousBlockHeaderQuery(chain *core.BlockChain, query *GetBlockHe
 		return headers
 	}
 	{ // Last mode: deliver ancestors of H
-		for i := uint64(1); header != nil && i < count; i++ {
+		for i := uint64(1); i < count; i++ {
 			header = chain.GetHeaderByHash(header.ParentHash)
 			if header == nil {
 				break
diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go
@@ -548,7 +548,7 @@ func (t *UDPv4) handlePacket(from *net.UDPAddr, buf []byte) error {
 	}
 	packet := t.wrapPacket(rawpacket)
 	fromID := fromKey.ID()
-	if err == nil && packet.preverify != nil {
+	if packet.preverify != nil {
 		err = packet.preverify(packet, from, fromID, fromKey)
 	}
 	t.log.Trace("<< "+packet.Name(), "id", fromID, "addr", from, "err", err)

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func serviceContiguousBlockHeaderQuery(chain core.BlockChain, query GetBlockHe`
`190`	`190`	`return headers`
`191`	`191`	`}`
`192`	`192`	`{ // Last mode: deliver ancestors of H`
`193`		`- for i := uint64(1); header != nil && i < count; i++ {`
	`193`	`+ for i := uint64(1); i < count; i++ {`
`194`	`194`	`header = chain.GetHeaderByHash(header.ParentHash)`
`195`	`195`	`if header == nil {`
`196`	`196`	`break`
Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ func (t UDPv4) handlePacket(from net.UDPAddr, buf []byte) error {`
`548`	`548`	`}`
`549`	`549`	`packet := t.wrapPacket(rawpacket)`
`550`	`550`	`fromID := fromKey.ID()`
`551`		`- if err == nil && packet.preverify != nil {`
	`551`	`+ if packet.preverify != nil {`
`552`	`552`	`err = packet.preverify(packet, from, fromID, fromKey)`
`553`	`553`	`}`
`554`	`554`	`t.log.Trace("<< "+packet.Name(), "id", fromID, "addr", from, "err", err)`