fixed merge
This commit is contained in:
@ -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
|
||||
}
|
||||
|
Reference in New Issue
Block a user