refactor: override backend immediately after db instantiation

ava-labs · Nov 14, 2024 · 4404e70 · 4404e70
1 parent 2f63ee1
commit 4404e70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/triedb/database.go b/triedb/database.go
@@ -106,6 +106,9 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 		diskdb:    diskdb,
 		preimages: preimages,
 	}
+	if db.overrideBackend(diskdb, config) {
+		return db
+	}
 	if config.HashDB != nil && config.PathDB != nil {
 		log.Crit("Both 'hash' and 'path' mode are configured")
 	}
@@ -121,7 +124,6 @@ func NewDatabase(diskdb ethdb.Database, config *Config) *Database {
 		}
 		db.backend = hashdb.New(diskdb, config.HashDB, resolver)
 	}
-	db.overrideBackend(diskdb, config)
 	return db
 }
 

diff --git a/triedb/database.libevm.go b/triedb/database.libevm.go
@@ -50,14 +50,13 @@ type BackendOverride interface {
 	ReaderProvider
 }
 
-func (db *Database) overrideBackend(diskdb ethdb.Database, config *Config) {
+func (db *Database) overrideBackend(diskdb ethdb.Database, config *Config) bool {
 	if config.DBOverride == nil {
-		return
+		return false
 	}
 	if config.HashDB != nil || config.PathDB != nil {
 		log.Crit("Database override provided when 'hash' or 'path' mode are configured")
 	}
-	db.backend.Close() //nolint:gosec // geth defaults to hashdb instances, which always return nil from Close()
 
 	db.backend = config.DBOverride(diskdb, config)
 	switch db.backend.(type) {
@@ -66,6 +65,7 @@ func (db *Database) overrideBackend(diskdb ethdb.Database, config *Config) {
 	default:
 		log.Crit("Database override is neither hash- nor path-based")
 	}
+	return true
 }
 
 var (