diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-20 22:18:07 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-20 22:18:07 +0800 |
| commit | 75625801f597061076d1e5863f97c9ea12aa10e4 (patch) | |
| tree | f45334ddc09a191c8dfe4e75f98f736bf67979f6 /core | |
| parent | ea9a549bbdc8377bca73f1417f2dc4a18396a382 (diff) | |
| parent | a59cd94625f589bb167be7a9c4588ff959dcfc00 (diff) | |
| download | go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar.gz go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar.bz2 go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar.lz go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar.xz go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.tar.zst go-tangerine-75625801f597061076d1e5863f97c9ea12aa10e4.zip | |
fixed merge
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_manager.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index dd0dd3cbe..47cad825d 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -396,8 +396,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { self.mu.Unlock() if chain { - //self.setTransState(state.New(block.Root(), self.db)) - //self.eventMux.Post(ChainEvent{block, td}) + fmt.Println("POST START") + self.eventMux.Post(ChainEvent{block, td}) + fmt.Println("POST END") } if split { @@ -413,7 +414,3 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error { func (self *ChainManager) GetAccount(addr []byte) *state.StateObject { return self.State().GetAccount(addr) } - -func (self *ChainManager) TransMut() *sync.RWMutex { - return &self.tsmu -} |