node, core/rawdb: fix ancients, era resolve

Author: fjl

core/rawdb/chain_freezer.go

@@ -60,7 +60,7 @@ type chainFreezer struct {
 //     state freezer (e.g. dev mode).
 //   - if non-empty directory is given, initializes the regular file-based
 //     state freezer.
-func newChainFreezer(datadir string, namespace string, readonly bool, eraDir string) (*chainFreezer, error) {
+func newChainFreezer(datadir string, eraDir string, namespace string, readonly bool) (*chainFreezer, error) {
 	if datadir == "" {
 		return &chainFreezer{
 			ancients: NewMemoryFreezer(readonly, chainFreezerTableConfigs),
@@ -72,12 +72,9 @@ func newChainFreezer(datadir string, namespace string, readonly bool, eraDir str
 	if err != nil {
 		return nil, err
 	}
-	var edb *eradb.Store
-	if eraDir != "" {
-		edb, err = eradb.New(eraDir)
-		if err != nil {
-			return nil, err
-		}
+	edb, err := eradb.New(resolveChainEraDir(datadir, eraDir))
+	if err != nil {
+		return nil, err
 	}
 	return &chainFreezer{
 		ancients: freezer,

core/rawdb/database.go

@@ -223,11 +223,7 @@ func Open(db ethdb.KeyValueStore, opts OpenOptions) (ethdb.Database, error) {
 	if chainFreezerDir != "" {
 		chainFreezerDir = resolveChainFreezerDir(chainFreezerDir)
 	}
-	var eraDir string
-	if chainFreezerDir != "" {
-		eraDir = resolveChainEraDir(chainFreezerDir, opts.Era)
-	}
-	frdb, err := newChainFreezer(chainFreezerDir, opts.MetricsNamespace, opts.ReadOnly, eraDir)
+	frdb, err := newChainFreezer(chainFreezerDir, opts.Era, opts.MetricsNamespace, opts.ReadOnly)
 	if err != nil {
 		printChainMetadata(db)
 		return nil, err

node/node.go

@@ -713,6 +713,7 @@ func (n *Node) OpenDatabaseWithOptions(name string, opt DatabaseOptions) (ethdb.
 			ReadOnly:         opt.ReadOnly,
 		})
 	} else {
+		opt.AncientsDirectory = n.ResolveAncient(name, opt.AncientsDirectory)
 		db, err = openDatabase(internalOpenOptions{
 			directory:       n.ResolvePath(name),
 			dbEngine:        n.config.DBEngine,