diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2015-06-22 17:14:07 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2015-06-24 23:34:04 +0800 |
| commit | 6260b86c153abfd1d4c96fa558ed20e80c6c0e4b (patch) | |
| tree | 39d39a65c2444ec570977113068fabafb191224e /eth/fetcher | |
| parent | 43e4a6501beb42bc0f4fffcbcb1e3f5fe58b6062 (diff) | |
| download | go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar.gz go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar.bz2 go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar.lz go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar.xz go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.tar.zst go-tangerine-6260b86c153abfd1d4c96fa558ed20e80c6c0e4b.zip | |
eth/fetcher: fix failed merge
Diffstat (limited to 'eth/fetcher')
| -rw-r--r-- | eth/fetcher/fetcher.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index a8f0dddbd..13c65121b 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -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 |