Merge fixes

This commit is contained in:
obscuren
2014-12-18 13:22:59 +01:00
parent 721e8ae93f
commit 0dc566124a
4 changed files with 8 additions and 12 deletions

View File

@ -101,7 +101,10 @@ func NewChainManager(mux *event.TypeMux) *ChainManager {
}
func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlock []byte) {
return self.TD, self.CurrentBlock.Hash(), self.Genesis().Hash()
self.mu.RLock()
defer self.mu.RUnlock()
return self.td, self.currentBlock.Hash(), self.Genesis().Hash()
}
func (self *ChainManager) SetProcessor(proc types.BlockProcessor) {