diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-04-07 16:03:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 16:03:11 +0800 |
| commit | cc13d576f07fb6803e09fb42880591a67b8b0ef6 (patch) | |
| tree | 6b2371c34416e3697443d836aab3a1f7fc32e77a /eth/fetcher | |
| parent | 71fdaa42386173da7bfa13f1728c394aeeb4eb01 (diff) | |
| parent | 158d603528d2ba36b633a8f22a2bff8329f69717 (diff) | |
| download | dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar.gz dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar.bz2 dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar.lz dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar.xz dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.tar.zst dexon-cc13d576f07fb6803e09fb42880591a67b8b0ef6.zip | |
Merge pull request #13870 from karalabe/miners-fixes
all: clean up various error handling in core and the miner
Diffstat (limited to 'eth/fetcher')
| -rw-r--r-- | eth/fetcher/fetcher.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 64a991069..98cc1a76b 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -23,7 +23,7 @@ import ( "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/consensus" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" @@ -654,7 +654,7 @@ func (f *Fetcher) insert(peer string, block *types.Block) { propBroadcastOutTimer.UpdateSince(block.ReceivedAt) go f.broadcastBlock(block, true) - case core.BlockFutureErr: + case consensus.ErrFutureBlock: // Weird future block, don't fail, but neither propagate default: |