diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 01:59:14 +0800 |
| commit | 544b7fba7f2e826bc7c4eef016082b266d17e5f6 (patch) | |
| tree | 85d7849fdf340a00349979cc481058d44a7c59ef /ethereum.go | |
| parent | b66fcf85dfecb13c3ed2b9f46ad6bb257ce84411 (diff) | |
| parent | cba2f6c2c472d5818541f6eabf3e18196d0c477d (diff) | |
| download | dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.gz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.bz2 dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.lz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.xz dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.tar.zst dexon-544b7fba7f2e826bc7c4eef016082b266d17e5f6.zip | |
Merge branch 'tmp' into develop
Conflicts:
peer.go
Diffstat (limited to 'ethereum.go')
| -rw-r--r-- | ethereum.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ethereum.go b/ethereum.go index 8f667b786..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 } @@ -503,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) |