refactor: inspectFreezers

Author: RodrigoVillar

core/rawdb/ancient_utils.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/libevm/ethdb"
+	"github.com/ava-labs/libevm/libevm/options"
 )
 
 type tableSize struct {
@@ -77,7 +78,10 @@ func inspect(name string, order map[string]bool, reader ethdb.AncientReader) (fr
 }
 
 // inspectFreezers inspects all freezers registered in the system.
-func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) {
+func inspectFreezers(db ethdb.Database, opts ...InspectDatabaseOption) ([]freezerInfo, error) {
+	if options.As[inspectDatabaseConfig](opts...).skipFreezers {
+		return nil, nil
+	}
 	var infos []freezerInfo
 	for _, freezer := range freezers {
 		switch freezer {

core/rawdb/database.go

@@ -604,13 +604,9 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte, opts ...Insp
 		{"Light client", "Bloom trie nodes", bloomTrieNodes.Size(), bloomTrieNodes.Count()},
 	}
 	// Inspect all registered append-only file store then.
-	ancients, err := inspectFreezers(db)
+	ancients, err := inspectFreezers(db, opts...)
 	if err != nil {
-		if errors.Is(err, errNotSupported) && libevmConfig.skipFreezers {
-			ancients = make([]freezerInfo, 0)
-		} else {
-			return err
-		}
+		return err
 	}
 	for _, ancient := range ancients {
 		for _, table := range ancient.sizes {