poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

eth/fetcher: fix failed merge

This commit is contained in:
Péter Szilágyi 2015-06-22 12:14:07 +03:00
parent 43e4a6501b
commit 6260b86c15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth/fetcher/fetcher.go
View File

@ -380,7 +380,7 @@ func (f *Fetcher) enqueue(peer string, block *types.Block) {
// Discard any past or too distant blocks
if dist := int64(block.NumberU64()) - int64(f.chainHeight()); dist < -maxUncleDist || dist > maxQueueDist {
glog.V(logger.Debug).Infof("Peer %s: discarded block #%d [%x], distance %d", peer, block.NumberU64(), hash.Bytes()[:4], dist)
f.discardStats.Mark(1)
f.discardMeter.Mark(1)
return
}
// Schedule the block for future importing