diff options
| author | Nick Johnson <arachnid@notdot.net> | 2017-07-06 19:40:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 19:40:22 +0800 |
| commit | 4b8860a7b4d409ed74c57a6a423af8103204c482 (patch) | |
| tree | b1b2bf716beb8b63c44ecf2d26b0f136d5fa00a8 /eth/handler.go | |
| parent | f25486c3fba497da1010c38da653262e144f87a5 (diff) | |
| parent | fe13949d9d938316c2c1b037b2cbce8e7bead525 (diff) | |
| download | go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar.gz go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar.bz2 go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar.lz go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar.xz go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.tar.zst go-tangerine-4b8860a7b4d409ed74c57a6a423af8103204c482.zip | |
Merge pull request #14723 from Arachnid/downloadrefactor
Refactor downloader to use interfaces instead of callbacks
Diffstat (limited to 'eth/handler.go')
| -rw-r--r-- | eth/handler.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/eth/handler.go b/eth/handler.go index 1af9e755b..b2422d71c 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -157,10 +157,7 @@ func NewProtocolManager(config *params.ChainConfig, mode downloader.SyncMode, ne return nil, errIncompatibleConfig } // Construct the different synchronisation mechanisms - manager.downloader = downloader.New(mode, chaindb, manager.eventMux, blockchain.HasHeader, blockchain.HasBlockAndState, blockchain.GetHeaderByHash, - blockchain.GetBlockByHash, blockchain.CurrentHeader, blockchain.CurrentBlock, blockchain.CurrentFastBlock, blockchain.FastSyncCommitHead, - blockchain.GetTdByHash, blockchain.InsertHeaderChain, manager.blockchain.InsertChain, blockchain.InsertReceiptChain, blockchain.Rollback, - manager.removePeer) + manager.downloader = downloader.New(mode, chaindb, manager.eventMux, blockchain, nil, manager.removePeer) validator := func(header *types.Header) error { return engine.VerifyHeader(blockchain, header, true) @@ -268,7 +265,7 @@ func (pm *ProtocolManager) handle(p *peer) error { defer pm.removePeer(p.id) // Register the peer in the downloader. If the downloader considers it banned, we disconnect - if err := pm.downloader.RegisterPeer(p.id, p.version, p.Head, p.RequestHeadersByHash, p.RequestHeadersByNumber, p.RequestBodies, p.RequestReceipts, p.RequestNodeData); err != nil { + if err := pm.downloader.RegisterPeer(p.id, p.version, p); err != nil { return err } // Propagate existing transactions. new transactions appearing |