core/state: fix broken test

Author: rjl493456442

core/bintrie_witness_test.go

@@ -19,6 +19,7 @@ package core
 import (
 	"encoding/binary"
 	"fmt"
+	"github.com/ethereum/go-ethereum/core/state/codedb"
 	"math/big"
 	"testing"
 
@@ -220,7 +221,7 @@ func TestProcessParentBlockHash(t *testing.T) {
 		cacheConfig := DefaultConfig().WithStateScheme(rawdb.PathScheme)
 		cacheConfig.SnapshotLimit = 0
 		triedb := triedb.NewDatabase(db, cacheConfig.triedbConfig(true))
-		statedb, _ := state.New(types.EmptyVerkleHash, state.NewDatabase(triedb, nil))
+		statedb, _ := state.New(types.EmptyVerkleHash, state.NewDatabase(triedb, codedb.New(db)))
 		checkBlockHashes(statedb, true)
 	})
 }

core/state/statedb.go

@@ -1306,18 +1306,20 @@ func (s *StateDB) commit(deleteEmptyObjects bool, rawStorageKey bool, blockNumbe
 	// Clear all internal flags and update state root at the end.
 	s.mutations = make(map[common.Address]*mutation)
 	s.stateObjectsDestruct = make(map[common.Address]*stateObject)
-	s.reader, _ = s.db.Reader(root)
 
 	origin := s.originalRoot
 	s.originalRoot = root
 
-	update := newStateUpdate(rawStorageKey, origin, root, blockNumber, deletes, updates, nodes)
-
 	start = time.Now()
+	update := newStateUpdate(rawStorageKey, origin, root, blockNumber, deletes, updates, nodes)
 	if err := s.db.Commit(update); err != nil {
 		return nil, err
 	}
 	s.DatabaseCommits = time.Since(start)
+
+	// The reader update must be performed as the final step, otherwise,
+	// the new state would not be visible before db.commit.
+	s.reader, _ = s.db.Reader(root)
 	return update, nil
 }