diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
| commit | a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5 (patch) | |
| tree | 6c16d3e2b216fdf0027a477a8975c9052930e34a /eth/sync.go | |
| parent | 1fe70a66ba2ef0f148affa7a72b4e65023474859 (diff) | |
| parent | 5176fbc6faaa5e7f0305ad7f2b896c092781deaa (diff) | |
| download | go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.gz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.bz2 go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.lz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.xz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.zst go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Conflicts:
rpc/jeth.go
Diffstat (limited to 'eth/sync.go')
| -rw-r--r-- | eth/sync.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/eth/sync.go b/eth/sync.go index c49f5209d..d955eaa50 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -63,6 +63,9 @@ func (pm *ProtocolManager) processBlocks() error { max := int(math.Min(float64(len(blocks)), float64(blockProcAmount))) _, err := pm.chainman.InsertChain(blocks[:max]) if err != nil { + // cancel download process + pm.downloader.Cancel() + return err } blocks = blocks[max:] |