Commit 6c6e8b0f authored by obscuren's avatar obscuren

Renamed block manager to state manager

parent 79320e28
...@@ -36,8 +36,8 @@ type Ethereum struct { ...@@ -36,8 +36,8 @@ type Ethereum struct {
// DB interface // DB interface
//db *ethdb.LDBDatabase //db *ethdb.LDBDatabase
db ethutil.Database db ethutil.Database
// Block manager for processing new blocks and managing the block chain // State manager for processing new blocks and managing the over all states
blockManager *ethchain.BlockManager stateManager *ethchain.StateManager
// The transaction pool. Transaction can be pushed on this pool // The transaction pool. Transaction can be pushed on this pool
// for later including in the blocks // for later including in the blocks
txPool *ethchain.TxPool txPool *ethchain.TxPool
...@@ -91,7 +91,7 @@ func New(caps Caps, usePnp bool) (*Ethereum, error) { ...@@ -91,7 +91,7 @@ func New(caps Caps, usePnp bool) (*Ethereum, error) {
} }
ethereum.txPool = ethchain.NewTxPool(ethereum) ethereum.txPool = ethchain.NewTxPool(ethereum)
ethereum.blockChain = ethchain.NewBlockChain(ethereum) ethereum.blockChain = ethchain.NewBlockChain(ethereum)
ethereum.blockManager = ethchain.NewBlockManager(ethereum) ethereum.stateManager = ethchain.NewStateManager(ethereum)
// Start the tx pool // Start the tx pool
ethereum.txPool.Start() ethereum.txPool.Start()
...@@ -103,8 +103,8 @@ func (s *Ethereum) BlockChain() *ethchain.BlockChain { ...@@ -103,8 +103,8 @@ func (s *Ethereum) BlockChain() *ethchain.BlockChain {
return s.blockChain return s.blockChain
} }
func (s *Ethereum) StateManager() *ethchain.BlockManager { func (s *Ethereum) StateManager() *ethchain.StateManager {
return s.blockManager return s.stateManager
} }
func (s *Ethereum) TxPool() *ethchain.TxPool { func (s *Ethereum) TxPool() *ethchain.TxPool {
...@@ -304,7 +304,7 @@ func (s *Ethereum) Stop() { ...@@ -304,7 +304,7 @@ func (s *Ethereum) Stop() {
close(s.quit) close(s.quit)
s.txPool.Stop() s.txPool.Stop()
s.blockManager.Stop() s.stateManager.Stop()
close(s.shutdownChan) close(s.shutdownChan)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment