diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-16 19:04:43 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-16 19:04:43 +0800 |
| commit | ad99089567757c315bc2e477c6f889b9c2c8789f (patch) | |
| tree | 49393c19fdc31bbb1b45b32e430b9f4361cf8c09 /eth | |
| parent | 61e8296bd82b4392e55e6707f37b7d1d1e897dd7 (diff) | |
| parent | ad7b0efbd3fc00e089159768b7475e657adf84fe (diff) | |
| download | dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar.gz dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar.bz2 dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar.lz dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar.xz dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.tar.zst dexon-ad99089567757c315bc2e477c6f889b9c2c8789f.zip | |
Merge branch 'hotfix/0.9.21.1' into develop
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/downloader/downloader.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 1bc81406c..d817b223c 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -145,8 +145,6 @@ func (d *Downloader) Synchronise(id string, hash common.Hash) error { glog.V(logger.Info).Infoln("Block synchronisation started") } - d.mux.Post(StartEvent{}) - // Create cancel channel for aborting mid-flight d.cancelLock.Lock() d.cancelCh = make(chan struct{}) @@ -166,6 +164,7 @@ func (d *Downloader) Synchronise(id string, hash common.Hash) error { if p == nil { return errUnknownPeer } + return d.syncWithPeer(p, hash) } @@ -181,6 +180,7 @@ func (d *Downloader) Has(hash common.Hash) bool { // syncWithPeer starts a block synchronization based on the hash chain from the // specified peer and head hash. func (d *Downloader) syncWithPeer(p *peer, hash common.Hash) (err error) { + d.mux.Post(StartEvent{}) defer func() { // reset on error if err != nil { |