Clean up init

Author: alarso16

core/blockchain.go

@@ -377,13 +377,7 @@ func NewBlockChain(
 		return nil, errCacheConfigNotSpecified
 	}
 	// Open trie database with provided config
-	var stateCache state.Database
-	triedbConfig := cacheConfig.triedbConfig()
-	if cacheConfig.StateScheme == customrawdb.FirewoodScheme {
-		stateCache = state.NewDatabaseWithFirewood(db, triedbConfig)
-	} else {
-		stateCache = state.NewDatabaseWithConfig(db, triedbConfig)
-	}
+	stateCache := state.NewDatabaseWithConfig(db, cacheConfig.triedbConfig())
 
 	// Setup the genesis block, commit the provided genesis specification
 	// to database if the genesis block is not present yet, or load the

core/genesis.go

@@ -230,6 +230,7 @@ func (g *Genesis) trieConfig() *triedb.Config {
 
 // TODO: migrate this function to "flush" for more similarity with upstream.
 func (g *Genesis) toBlock(coredb state.Database) *types.Block {
+	fmt.Println("ToBlock", len(g.Alloc))
 	statedb, err := state.New(types.EmptyRootHash, coredb, nil)
 	if err != nil {
 		panic(err)

core/state/database.go

@@ -55,11 +55,7 @@ func NewDatabase(db ethdb.Database) ethstate.Database {
 }
 
 func NewDatabaseWithConfig(db ethdb.Database, config *triedb.Config) ethstate.Database {
-	if config == nil {
-		return NewDatabase(db)
-	}
-
-	if config.DBOverride == nil {
+	if config == nil || config.DBOverride == nil {
 		return ethstate.NewDatabaseWithConfig(db, config)
 	}
 
@@ -73,7 +69,6 @@ func NewDatabaseWithConfig(db ethdb.Database, config *triedb.Config) ethstate.Da
 		return ethstate.NewDatabaseWithConfig(db, config)
 	}
 	if innerdb == nil {
-		fmt.Printf("firewood is nil")
 		log.Error("firewooddb.Database is nil")
 		return nil
 	}
@@ -88,28 +83,6 @@ func NewDatabaseWithNodeDB(db ethdb.Database, triedb *triedb.Database) ethstate.
 	return ethstate.NewDatabaseWithNodeDB(db, triedb)
 }
 
-// Note trieConfig provides a closure here.
-func NewDatabaseWithFirewood(db ethdb.Database, trieConfig *triedb.Config) Database {
-	// I could create my own Config, create the config, and create the triedb.Config
-	// Don't accept the triedb and create it here
-	fw, ok := trieConfig.DBOverride(db).(*firewood.Database)
-	if !ok {
-		log.Error("Cannot create firewooddb.Database from the provided database")
-		fmt.Printf("not ok")
-		return nil
-	}
-	if fw == nil {
-		fmt.Printf("firewood is nil")
-		log.Error("firewooddb.Database is nil")
-		return nil
-	}
-
-	return &firewoodAccessorDb{
-		Database: ethstate.NewDatabaseWithConfig(db, trieConfig),
-		fw:       fw,
-	}
-}
-
 type firewoodAccessorDb struct {
 	Database
 	fw *firewood.Database
@@ -132,5 +105,4 @@ func (db *firewoodAccessorDb) OpenStorageTrie(stateRoot common.Hash, address com
 // CopyTrie returns an independent copy of the given trie.
 func (db *firewoodAccessorDb) CopyTrie(trie Trie) Trie {
 	panic("CopyTrie not implemented for firewoodAccessorDb")
-	return nil
 }

core/state/database_test.go

@@ -82,7 +82,7 @@ func TestInsert(t *testing.T) {
 		MetricsPort:       0, // use any open port from OS
 	}
 	config.DBOverride = fwCfg.BackendConstructor // BackendConstructor is on the reference to allow closure
-	fwdb := NewDatabaseWithFirewood(firewoodmemdb, config)
+	fwdb := NewDatabaseWithConfig(firewoodmemdb, config)
 
 	ethRoot := types.EmptyRootHash