resolve keefe's comment

bnb-chain · Jan 20, 2022 · 6299c90 · 6299c90
1 parent 8913b09
commit 6299c90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -602,6 +602,8 @@ func (bc *BlockChain) tryRewindBadBlocks() {
  log.Warn("current block verified failed, rewind to its parent", "height", block.NumberU64(), "hash", block.Hash())
  bc.futureBlocks.Remove(block.Hash())
  bc.badBlockCache.Add(block.Hash(), time.Now())
+ bc.diffLayerCache.Remove(block.Hash())
+ bc.diffLayerRLPCache.Remove(block.Hash())
  bc.reportBlock(block, nil, errStateRootVerificationFailed)
  bc.setHeadBeyondRoot(block.NumberU64()-1, common.Hash{})
  }

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -172,10 +172,7 @@ func newStateDB(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB,
  tr, err := db.OpenTrie(root)
  // return error when 1. failed to open trie and 2. the snap is not nil and done verification
  if err != nil && (sdb.snap == nil || snapVerified) {
- if err != nil {
- return nil, err
- }
- return nil, fmt.Errorf("no available state")
+ return nil, err
  }
  sdb.trie = tr
  return sdb, nil