forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-08 16:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/downloader: refactor

Browse source
This commit is contained in:
healthykim 2026-04-20 09:49:26 +02:00
parent 1360c80623
commit 6bd6799a1e
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
eth/downloader/fetchers_concurrent.go
View file

@ -325,30 +325,25 @@ func (d *Downloader) concurrentFetch(queue typedQueue) error {
// If the peer was previously banned and failed to deliver its pack
// in a reasonable time frame, ignore its message.
if peer := d.peers.Peer(res.Req.Peer); peer != nil {
// Deliver the received chunk of data and check chain validity
accepted, err := queue.deliver(peer, res)
if errors.Is(err, errInvalidChain) {
res.Done <- err
res.Req.Close()
return err
}
if errors.Is(err, errInvalidBody) || errors.Is(err, errInvalidReceipt) {
// Signal the dispatcher with the error to drop the peer.
res.Done <- err
res.Req.Close()
continue
}
// Unless a peer delivered something completely else than requested (usually
// caused by a timed out request which came through in the end), set it to
// idle. If the delivery's stale, the peer should have already been idled.
if !errors.Is(err, errStaleDelivery) {
queue.updateCapacity(peer, accepted, res.Time)
}
peer := d.peers.Peer(res.Req.Peer)
if peer == nil {
res.Done <- nil
res.Req.Close()
continue
}
// Signal the dispatcher that the round trip is done.
res.Done <- nil
// Deliver the received chunk of data and check chain validity
accepted, err := queue.deliver(peer, res)
// Unless a peer delivered something completely else than requested (usually
// caused by a timed out request which came through in the end), set it to
// idle. If the delivery's stale, the peer should have already been idled.
if !errors.Is(err, errStaleDelivery) {
queue.updateCapacity(peer, accepted, res.Time)
}
res.Done <- errorOfRequest(err)
res.Req.Close()
if errors.Is(err, errInvalidChain) {
return err
}
case cont := <-queue.waker():
// The header fetcher sent a continuation flag, check if it's done
@ -358,3 +353,10 @@ func (d *Downloader) concurrentFetch(queue typedQueue) error {
}
}
}
func errorOfRequest(err error) error {
if errors.Is(err, errInvalidBody) || errors.Is(err, errInvalidReceipt) {
return err
}
return nil
}