aboutsummaryrefslogtreecommitdiffstats
path: root/eth/downloader
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-19 00:55:50 +0800
committerobscuren <geffobscura@gmail.com>2015-04-19 00:57:59 +0800
commit0d536734fe10e62dce86db1a6128b383ef66921d (patch)
tree1254ba614e724ee04df3035515e2597d70f6f26c /eth/downloader
parentc2c24b3bb419a8ffffb58ec25788b951bef779f9 (diff)
downloaddexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar.gz
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar.bz2
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar.lz
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar.xz
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.tar.zst
dexon-0d536734fe10e62dce86db1a6128b383ef66921d.zip
eth: adapted to new synchronous api of downloader's AddBlock
Diffstat (limited to 'eth/downloader')
-rw-r--r--eth/downloader/downloader.go2
-rw-r--r--eth/downloader/synchronous.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 810031c79..6dce40b04 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -173,8 +173,6 @@ out:
select {
case sync := <-d.syncCh:
var peer *peer = sync.peer
- d.activePeer = peer.id
-
err := d.getFromPeer(peer, sync.hash, sync.ignoreInitial)
if err != nil {
break
diff --git a/eth/downloader/synchronous.go b/eth/downloader/synchronous.go
index 0511533cf..7bb49d24e 100644
--- a/eth/downloader/synchronous.go
+++ b/eth/downloader/synchronous.go
@@ -50,6 +50,8 @@ func (d *Downloader) Synchronise() (types.Blocks, error) {
}
func (d *Downloader) getFromPeer(p *peer, hash common.Hash, ignoreInitial bool) error {
+ d.activePeer = p.id
+
glog.V(logger.Detail).Infoln("Synchronising with the network using:", p.id)
// Start the fetcher. This will block the update entirely
// interupts need to be send to the appropriate channels