optimise

diff --git a/protocol/block.go b/protocol/block.go
index 7f0f0fe..8596226 100644 (file)
--- a/protocol/block.go
+++ b/protocol/block.go
@@ -333,14 +333,10 @@ func (c *Chain) processBlock(block *types.Block) (bool, error) {
 
        bestBlock := c.saveSubBlock(block)
        bestBlockHeader := &bestBlock.BlockHeader
-       parentBestBlockHeader, err := c.store.GetBlockHeader(&bestBlockHeader.PreviousBlockHash)
-       if err != nil {
-               return false, err
-       }
 
        c.cond.L.Lock()
        defer c.cond.L.Unlock()
-       if parentBestBlockHeader.Hash() == c.bestBlockHeader.Hash() {
+       if bestBlockHeader.PreviousBlockHash == c.bestBlockHeader.Hash() {
                log.WithFields(log.Fields{"module": logModule}).Debug("append block to the end of mainchain")
                return false, c.connectBlock(bestBlock)
        }

diff --git a/protocol/protocol.go b/protocol/protocol.go
index 85ca732..ba9443d 100644 (file)
--- a/protocol/protocol.go
+++ b/protocol/protocol.go
@@ -136,8 +136,6 @@ func (c *Chain) setState(blockHeader, irrBlockHeader *types.BlockHeader, view *s
                return err
        }
 
-       c.cond.L.Lock()
-       defer c.cond.L.Unlock()
        c.bestBlockHeader = blockHeader
        c.bestIrrBlockHeader = irrBlockHeader