diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
| commit | bab78bbeb691d95bdd0222435af0c11cb3485a79 (patch) | |
| tree | 804c9689546ce362a2862b00bb4e76160052f5d6 /ethereum.go | |
| parent | 7a79428278412ab1f73708af51bce063b000b7a7 (diff) | |
| parent | 1360f027d9e365242466ca346b2b56f421729d91 (diff) | |
| download | dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.gz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.bz2 dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.lz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.xz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.zst dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.zip | |
Merge branch 'tests' of github.com:ethereum/go-ethereum into tests
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") |