diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-18 20:22:59 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-18 20:22:59 +0800 |
| commit | 0dc566124aee24cf3f01b4e586bde7752da89824 (patch) | |
| tree | 22bfe271447f8b42598b3066cb92d87df93c7095 /eth | |
| parent | 721e8ae93f9b8918ff4bc74af86c530bacacea00 (diff) | |
| download | go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.gz go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.bz2 go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.lz go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.xz go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.tar.zst go-tangerine-0dc566124aee24cf3f01b4e586bde7752da89824.zip | |
Merge fixes
Diffstat (limited to 'eth')
| -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 ef82a5bfc..0aad6a514 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -69,9 +69,9 @@ func New(db ethutil.Database, identity p2p.ClientIdentity, keyManager *crypto.Ke eventMux: &event.TypeMux{}, } - eth.txPool = core.NewTxPool(eth) eth.chainManager = core.NewChainManager(eth.EventMux()) - eth.blockManager = core.NewBlockManager(eth) + eth.txPool = core.NewTxPool(eth.chainManager, eth.EventMux()) + eth.blockManager = core.NewBlockManager(eth.txPool, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockManager) eth.whisper = whisper.New() |