forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-18 05:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/fetcher: fix failed merge

Browse source
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 // Discard any past or too distant blocks
if dist := int64(block.NumberU64()) - int64(f.chainHeight()); dist < -maxUncleDist || dist > maxQueueDist { 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) 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 return
} }
// Schedule the block for future importing // Schedule the block for future importing