fix: other changes

Author: alarso16

core/extstate/firewood_database.go

@@ -34,7 +34,7 @@ func (*firewoodAccessorDb) OpenStorageTrie(_ common.Hash, _ common.Address, acco
 	if !ok {
 		return nil, fmt.Errorf("Invalid account trie type: %T", self)
 	}
-	return firewood.NewStorageTrie(accountTrie, accountRoot)
+	return firewood.NewStorageTrie(accountTrie)
 }
 
 // CopyTrie returns a deep copy of the given trie.

triedb/firewood/account_trie.go

@@ -89,9 +89,9 @@ func (a *AccountTrie) GetAccount(addr common.Address) (*types.StateAccount, erro
 }
 
 // GetStorage returns the value associated with a storage key for a given account address.
-// If the storage slot has been updated, the new value is returned.
-// If the storage slot has been deleted, (nil, nil) is returned.
-// If the storage slot does not exist, (nil, nil) is returned.
+// - If the storage slot has been updated, the new value is returned.
+// - If the storage slot has been deleted, (nil, nil) is returned.
+// - If the storage slot does not exist, (nil, nil) is returned.
 func (a *AccountTrie) GetStorage(addr common.Address, key []byte) ([]byte, error) {
 	// If the account has been deleted, we should return nil
 	accountKey := crypto.Keccak256Hash(addr.Bytes()).Bytes()

triedb/firewood/database.go

@@ -77,7 +77,11 @@ var Defaults = Config{
 }
 
 func (c Config) BackendConstructor(ethdb.Database) triedb.DBOverride {
-	return New(&c)
+	db, err := New(c)
+	if err != nil {
+		log.Crit("firewood: error creating database", "error", err)
+	}
+	return db
 }
 
 type Database struct {
@@ -94,14 +98,9 @@ type Database struct {
 
 // New creates a new Firewood database with the given disk database and configuration.
 // Any error during creation will cause the program to exit.
-func New(config *Config) *Database {
-	if config == nil {
-		log.Crit("firewood: config must be provided")
-	}
-
-	err := validatePath(config.FilePath)
-	if err != nil {
-		log.Crit("firewood: error validating config", "error", err)
+func New(config Config) (*Database, error) {
+	if err := validatePath(config.FilePath); err != nil {
+		return nil, err
 	}
 
 	fw, err := ffi.New(config.FilePath, &ffi.Config{
@@ -111,12 +110,12 @@ func New(config *Config) *Database {
 		ReadCacheStrategy:    config.ReadCacheStrategy,
 	})
 	if err != nil {
-		log.Crit("firewood: error creating firewood database", "error", err)
+		return nil, err
 	}
 
 	currentRoot, err := fw.Root()
 	if err != nil {
-		log.Crit("firewood: error getting current root", "error", err)
+		return nil, err
 	}
 
 	return &Database{
@@ -125,7 +124,7 @@ func New(config *Config) *Database {
 		proposalTree: &ProposalContext{
 			Root: common.Hash(currentRoot),
 		},
-	}
+	}, nil
 }
 
 func validatePath(path string) error {

triedb/firewood/storage_trie.go

@@ -14,7 +14,7 @@ type StorageTrie struct {
 
 // `NewStorageTrie` returns a wrapper around an `AccountTrie` since Firewood
 // does not require a separate storage trie. All changes are managed by the account trie.
-func NewStorageTrie(accountTrie *AccountTrie, _ common.Hash) (*StorageTrie, error) {
+func NewStorageTrie(accountTrie *AccountTrie) (*StorageTrie, error) {
 	return &StorageTrie{
 		AccountTrie: accountTrie,
 	}, nil