sync: coreth PR #1151: update firewood and fix test flakes (#1714)

Co-authored-by: Austin Larson <78000745+alarso16@users.noreply.github.com>

Author: JonathanOppenheimer

core/extstate/database_test.go

@@ -82,7 +82,7 @@ func newFuzzState(t *testing.T) *fuzzState {
 	})
 
 	firewoodMemdb := rawdb.NewMemoryDatabase()
-	fwCfg := firewood.Defaults
+	fwCfg := firewood.Defaults                              // copy the defaults
 	fwCfg.FilePath = filepath.Join(t.TempDir(), "firewood") // Use a temporary directory for the Firewood
 	firewoodState := NewDatabaseWithConfig(
 		firewoodMemdb,
@@ -309,15 +309,6 @@ func (fs *fuzzState) deleteStorage(accountIndex int, storageIndexInput uint64) {
 }
 
 func FuzzTree(f *testing.F) {
-	for randSeed := range int64(1000) {
-		rand := rand.New(rand.NewSource(randSeed))
-		steps := make([]byte, 32)
-		_, err := rand.Read(steps)
-		if err != nil {
-			f.Fatal(err)
-		}
-		f.Add(randSeed, steps)
-	}
 	f.Fuzz(func(t *testing.T, randSeed int64, byteSteps []byte) {
 		fuzzState := newFuzzState(t)
 		rand := rand.New(rand.NewSource(randSeed))

plugin/evm/vm_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/snow/consensus/snowman"
 	"github.com/ava-labs/avalanchego/snow/engine/enginetest"
+	"github.com/ava-labs/avalanchego/snow/snowtest"
 	"github.com/ava-labs/avalanchego/upgrade"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
@@ -440,9 +441,28 @@ func testBuildEthTxBlock(t *testing.T, scheme string) {
 		t.Fatalf("Found unexpected blkID for parent of blk2")
 	}
 
-	restartedTVM, err := restartVM(tvm, tvm.config)
-	require.NoError(t, err)
-	restartedVM := restartedTVM.vm
+	// Close the vm and all databases
+	if err := tvm.vm.Shutdown(context.Background()); err != nil {
+		t.Fatal(err)
+	}
+
+	restartedVM := &VM{}
+	newCTX := snowtest.Context(t, snowtest.CChainID)
+	newCTX.NetworkUpgrades = upgradetest.GetConfig(fork)
+	newCTX.ChainDataDir = tvm.vm.ctx.ChainDataDir
+	conf := getConfig(scheme, "")
+	if err := restartedVM.Initialize(
+		context.Background(),
+		newCTX,
+		tvm.db,
+		[]byte(toGenesisJSON(paramstest.ForkToChainConfig[fork])),
+		[]byte(""),
+		[]byte(conf),
+		[]*commonEng.Fx{},
+		nil,
+	); err != nil {
+		t.Fatal(err)
+	}
 
 	// State root should not have been committed and discarded on restart
 	if ethBlk1Root := ethBlk1.Root(); restartedVM.blockChain.HasState(ethBlk1Root) {
@@ -454,6 +474,11 @@ func testBuildEthTxBlock(t *testing.T, scheme string) {
 	if ethBlk2Root := ethBlk2.Root(); !restartedVM.blockChain.HasState(ethBlk2Root) {
 		t.Fatalf("Expected blk2 state root to not be pruned after shutdown (last accepted tip should be committed)")
 	}
+
+	// Shutdown the newest VM
+	if err := restartedVM.Shutdown(context.Background()); err != nil {
+		t.Fatal(err)
+	}
 }
 
 // Regression test to ensure that after accepting block A

triedb/firewood/database.go

@@ -68,8 +68,8 @@ type Config struct {
 	ReadCacheStrategy    ffi.CacheStrategy
 }
 
-// Note that `FilePath` is not specificied, and must always be set by the user.
-var Defaults = &Config{
+// Note that `FilePath` is not specified, and must always be set by the user.
+var Defaults = Config{
 	CleanCacheSize:       1024 * 1024, // 1MB
 	FreeListCacheEntries: 40_000,
 	Revisions:            100,
@@ -96,15 +96,20 @@ type Database struct {
 // Any error during creation will cause the program to exit.
 func New(config *Config) *Database {
 	if config == nil {
-		config = Defaults
+		log.Crit("firewood: config must be provided")
 	}
 
-	fwConfig, err := validatePath(config)
+	err := validatePath(config.FilePath)
 	if err != nil {
 		log.Crit("firewood: error validating config", "error", err)
 	}
 
-	fw, err := ffi.New(config.FilePath, fwConfig)
+	fw, err := ffi.New(config.FilePath, &ffi.Config{
+		NodeCacheEntries:     uint(config.CleanCacheSize) / 256, // TODO: estimate 256 bytes per node
+		FreeListCacheEntries: config.FreeListCacheEntries,
+		Revisions:            config.Revisions,
+		ReadCacheStrategy:    config.ReadCacheStrategy,
+	})
 	if err != nil {
 		log.Crit("firewood: error creating firewood database", "error", err)
 	}
@@ -123,33 +128,25 @@ func New(config *Config) *Database {
 	}
 }
 
-func validatePath(trieConfig *Config) (*ffi.Config, error) {
-	if trieConfig.FilePath == "" {
-		return nil, errors.New("firewood database file path must be set")
+func validatePath(path string) error {
+	if path == "" {
+		return errors.New("firewood database file path must be set")
 	}
 
 	// Check that the directory exists
-	dir := filepath.Dir(trieConfig.FilePath)
+	dir := filepath.Dir(path)
 	_, err := os.Stat(dir)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return nil, fmt.Errorf("error checking database directory: %w", err)
-		}
-		log.Info("Database directory not found, creating", "path", dir)
-		if err := os.MkdirAll(dir, 0o755); err != nil {
-			return nil, fmt.Errorf("error creating database directory: %w", err)
-		}
+	if err == nil {
+		return nil // Directory exists
 	}
-
-	// Create the Firewood config from the provided config.
-	config := &ffi.Config{
-		NodeCacheEntries:     uint(trieConfig.CleanCacheSize) / 256, // TODO: estimate 256 bytes per node
-		FreeListCacheEntries: trieConfig.FreeListCacheEntries,
-		Revisions:            trieConfig.Revisions,
-		ReadCacheStrategy:    trieConfig.ReadCacheStrategy,
+	if !os.IsNotExist(err) {
+		return fmt.Errorf("error checking database directory: %w", err)
 	}
-
-	return config, nil
+	log.Info("Database directory not found, creating", "path", dir)
+	if err := os.MkdirAll(dir, 0o755); err != nil {
+		return fmt.Errorf("error creating database directory: %w", err)
+	}
+	return nil
 }
 
 // Scheme returns the scheme of the database.