Address PR comments

core/blockchain.go

@@ -937,14 +937,8 @@ func (bc *BlockChain) WriteBlockWithoutState(block *types.Block, td *big.Int) (e
 }
 
 func (bc *BlockChain) AddToStateDiffProcessedCollection(hash common.Hash) {
-	count, ok := bc.stateDiffsProcessed[hash]
+	count := bc.stateDiffsProcessed[hash]
-
+	bc.stateDiffsProcessed[hash] = count + 1
-	if ok {
-		count++
-		bc.stateDiffsProcessed[hash] = count
-	} else {
-		bc.stateDiffsProcessed[hash] = 1
-	}
 }
 
 // WriteBlockWithState writes the block and all associated state to the database.

core/blockchain_test.go

@@ -1816,11 +1816,11 @@ func TestProcessingStateDiffs(t *testing.T) {
 	defaultTrieDirtyCache := 256
 	defaultTrieTimeout := 60 * time.Minute
 	cacheConfig := &CacheConfig{
-		Disabled:          false,
+		Disabled:             false,
-		TrieCleanLimit:    defaultTrieCleanCache,
+		TrieCleanLimit:       defaultTrieCleanCache,
-		TrieDirtyLimit:    defaultTrieDirtyCache,
+		TrieDirtyLimit:       defaultTrieDirtyCache,
-		TrieTimeLimit:     defaultTrieTimeout,
+		TrieTimeLimit:        defaultTrieTimeout,
-		ProcessStateDiffs: true,
+		ProcessingStateDiffs: true,
 	}
 	db := ethdb.NewMemDatabase()
 	genesis := new(Genesis).MustCommit(db)

eth/backend.go

@@ -171,7 +171,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 			TrieDirtyLimit:      config.TrieDirtyCache,
 			TrieDirtyDisabled:   config.NoPruning,
 			TrieTimeLimit:       config.TrieTimeout,
-			ProcessStateDiffs: config.StateDiff,
+			ProcessingStateDiffs: config.StateDiff,
 		}
 	)
 	eth.blockchain, err = core.NewBlockChain(chainDb, cacheConfig, chainConfig, eth.engine, vmConfig, eth.shouldPreserve)