status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1752 from karalabe/fix-eth61-test 

eth/downloader: fix race causing occasional test failure
This commit is contained in:
Felix Lange 2015-09-03 15:52:18 +02:00
parent ebbe25ee71 1f1d73ab74
commit e2d7c1a523
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eth/downloader/downloader.go
View File

@ -739,9 +739,11 @@ func (d *Downloader) fetchBlocks61(from uint64) error {
break
}
// Send a download request to all idle peers, until throttled
throttled := false
for _, peer := range d.peers.IdlePeers() {
// Short circuit if throttling activated
if d.queue.Throttle() {
throttled = true
break
}
// Reserve a chunk of hashes for a peer. A nil can mean either that
@ -762,7 +764,7 @@ func (d *Downloader) fetchBlocks61(from uint64) error {
}
// Make sure that we have peers available for fetching. If all peers have been tried
// and all failed throw an error
if !d.queue.Throttle() && d.queue.InFlight() == 0 {
if !throttled && d.queue.InFlight() == 0 {
return errPeersUnavailable
}
}