diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 02:40:54 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 02:40:54 +0800 |
| commit | bb4495722f869f456f1f12234bb881ef71a7960f (patch) | |
| tree | ae9b4ddf48556081ff4d3d3328dbc4227f4aa256 /ethereum.go | |
| parent | 57dc435f9b928f5de2a49736a2c71a7bf611289a (diff) | |
| parent | 1118aaf840a6f6b4dd6b137f39ab895a0cbd5a56 (diff) | |
| download | dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar.gz dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar.bz2 dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar.lz dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar.xz dexon-bb4495722f869f456f1f12234bb881ef71a7960f.tar.zst dexon-bb4495722f869f456f1f12234bb881ef71a7960f.zip | |
Merge branch 'release/0.6.6'
Diffstat (limited to 'ethereum.go')
| -rw-r--r-- | ethereum.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ethereum.go b/ethereum.go index 09665336c..389b9d4e4 100644 --- a/ethereum.go +++ b/ethereum.go @@ -158,6 +158,9 @@ func (s *Ethereum) StateManager() *ethchain.StateManager { func (s *Ethereum) TxPool() *ethchain.TxPool { return s.txPool } +func (s *Ethereum) BlockPool() *BlockPool { + return s.blockPool +} func (self *Ethereum) Db() ethutil.Database { return self.db } @@ -383,7 +386,6 @@ func (s *Ethereum) ReapDeadPeerHandler() { // Start the ethereum func (s *Ethereum) Start(seed bool) { s.reactor.Start() - s.blockPool.Start() // Bind to addr and port ln, err := net.Listen("tcp", ":"+s.Port) if err != nil { @@ -504,6 +506,7 @@ func (s *Ethereum) Stop() { s.stateManager.Stop() s.reactor.Flush() s.reactor.Stop() + s.blockPool.Stop() ethlogger.Infoln("Server stopped") close(s.shutdownChan) |