diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 01:42:32 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 01:42:32 +0800 |
| commit | 1360f027d9e365242466ca346b2b56f421729d91 (patch) | |
| tree | a30ff7292e87583781b682b47d851d0f6e1925fc /ethereum.go | |
| parent | b3629c6f62bd3774eb8858819a8ee07dfb775b73 (diff) | |
| parent | 795b14330ad4399ef292835eac452d258dcd7464 (diff) | |
| download | dexon-1360f027d9e365242466ca346b2b56f421729d91.tar dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.gz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.bz2 dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.lz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.xz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.zst dexon-1360f027d9e365242466ca346b2b56f421729d91.zip | |
Merge pull request #216 from ethereum/develop
Update tests branch from develop
Diffstat (limited to 'ethereum.go')
| -rw-r--r-- | ethereum.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ethereum.go b/ethereum.go index 94e46b556..5d74e28e9 100644 --- a/ethereum.go +++ b/ethereum.go @@ -128,9 +128,9 @@ func New(db ethutil.Database, clientIdentity wire.ClientIdentity, keyManager *cr } ethereum.blockPool = NewBlockPool(ethereum) - ethereum.txPool = core.NewTxPool(ethereum) ethereum.blockChain = core.NewChainManager(ethereum.EventMux()) - ethereum.blockManager = core.NewBlockManager(ethereum) + ethereum.txPool = core.NewTxPool(ethereum.blockChain, ethereum, ethereum.EventMux()) + ethereum.blockManager = core.NewBlockManager(ethereum.txPool, ethereum.blockChain, ethereum.EventMux()) ethereum.blockChain.SetProcessor(ethereum.blockManager) // Start the tx pool @@ -393,7 +393,6 @@ func (s *Ethereum) reapDeadPeerHandler() { // Start the ethereum func (s *Ethereum) Start(seed bool) { s.blockPool.Start() - s.blockManager.Start() // Bind to addr and port ln, err := net.Listen("tcp", ":"+s.Port) @@ -517,7 +516,6 @@ func (s *Ethereum) Stop() { s.RpcServer.Stop() } s.txPool.Stop() - s.blockManager.Stop() s.blockPool.Stop() loggerger.Infoln("Server stopped") |