diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-15 19:12:46 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-15 19:12:46 +0800 |
| commit | c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05 (patch) | |
| tree | 7ab7c369420a05ff51337a4aed7c5ec88490b90f /eth/backend.go | |
| parent | 158efbaa459c534bfb53624e1df7f65e7e8ca24a (diff) | |
| parent | cfb2b51b749a5897eb47bee15e67a0f9d850bfbd (diff) | |
| download | go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar.gz go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar.bz2 go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar.lz go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar.xz go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.tar.zst go-tangerine-c1f0d40e34a80f4453a9a54f90e2d4551c3bdb05.zip | |
Merge pull request #987 from obscuren/develop
Miner updates and downloader events
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/backend.go b/eth/backend.go index 362a7eab7..064018955 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -265,12 +265,12 @@ func New(config *Config) (*Ethereum, error) { } eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) - eth.downloader = downloader.New(eth.chainManager.HasBlock, eth.chainManager.GetBlock) + eth.downloader = downloader.New(eth.EventMux(), eth.chainManager.HasBlock, eth.chainManager.GetBlock) eth.pow = ethash.New() eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State, eth.chainManager.GasLimit) eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockProcessor) - eth.miner = miner.New(eth, eth.pow) + eth.miner = miner.New(eth, eth.EventMux(), eth.pow) eth.miner.SetGasPrice(config.GasPrice) eth.protocolManager = NewProtocolManager(config.ProtocolVersion, config.NetworkId, eth.eventMux, eth.txPool, eth.chainManager, eth.downloader) |