diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-15 22:43:37 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-15 22:43:37 +0800 |
| commit | 263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9 (patch) | |
| tree | 730df04d1439ddc089798a9da5b00ab849b95494 /eth/handler.go | |
| parent | 6f5c6150b7060b6b2ee68ac95b30f46c5c2c7f90 (diff) | |
| parent | aa250e228a7f2eec5d512d05eb042b75e2755d30 (diff) | |
| download | dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar.gz dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar.bz2 dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar.lz dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar.xz dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.tar.zst dexon-263903378b81f4a17ab34f5ad0d3a7ceb2b5dea9.zip | |
Merge pull request #1243 from karalabe/instrument-downloader-sync
eth, eth/downloader: separate concerns, clean up test suite
Diffstat (limited to 'eth/handler.go')
| -rw-r--r-- | eth/handler.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/handler.go b/eth/handler.go index f002727f3..ec4f2d53a 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -68,12 +68,11 @@ type ProtocolManager struct { // NewProtocolManager returns a new ethereum sub protocol manager. The Ethereum sub protocol manages peers capable // with the ethereum network. -func NewProtocolManager(protocolVersion, networkId int, mux *event.TypeMux, txpool txPool, chainman *core.ChainManager, downloader *downloader.Downloader) *ProtocolManager { +func NewProtocolManager(protocolVersion, networkId int, mux *event.TypeMux, txpool txPool, chainman *core.ChainManager) *ProtocolManager { manager := &ProtocolManager{ eventMux: mux, txpool: txpool, chainman: chainman, - downloader: downloader, peers: newPeerSet(), newPeerCh: make(chan *peer, 1), newHashCh: make(chan []*blockAnnounce, 1), @@ -81,6 +80,7 @@ func NewProtocolManager(protocolVersion, networkId int, mux *event.TypeMux, txpo txsyncCh: make(chan *txsync), quitSync: make(chan struct{}), } + manager.downloader = downloader.New(manager.eventMux, manager.chainman.HasBlock, manager.chainman.GetBlock, manager.chainman.InsertChain, manager.removePeer) manager.SubProtocol = p2p.Protocol{ Name: "eth", Version: uint(protocolVersion), |