From 2f211bdd7fde4342a1db178636fd453210d1bf1b Mon Sep 17 00:00:00 2001 From: jsvisa Date: Tue, 26 Sep 2023 07:52:31 +0800 Subject: [PATCH] Revert "cmd/utils: tryMakeReadOnlyDB should open chaindb only" This reverts commit e4669c02081aeeeaebb65eb5123784f74c343a88. Signed-off-by: jsvisa --- cmd/utils/flags.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5531755ce4..a212a26426 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2046,7 +2046,7 @@ func SplitTagsFlag(tagsFlag string) map[string]string { } // MakeChainDatabase open an Pebble/LevelDB using the flags passed to the client and will hard crash if it fails. -func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool, nofreeze bool) ethdb.Database { +func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.Database { var ( cache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100 handles = MakeDatabaseHandles(ctx.Int(FDLimitFlag.Name)) @@ -2064,8 +2064,6 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool, nofree chainDb = remotedb.New(client) case ctx.String(SyncModeFlag.Name) == "light": chainDb, err = stack.OpenDatabase("lightchaindata", cache, handles, "", readonly) - case nofreeze: - chainDb, err = stack.OpenDatabase("chaindata", cache, handles, "", readonly) default: chainDb, err = stack.OpenDatabaseWithFreezer("chaindata", cache, handles, ctx.String(AncientFlag.Name), "", readonly) } @@ -2084,7 +2082,7 @@ func tryMakeReadOnlyDatabase(ctx *cli.Context, stack *node.Node) ethdb.Database if rawdb.PreexistingDatabase(stack.ResolvePath("chaindata")) == "" { readonly = false } - return MakeChainDatabase(ctx, stack, readonly, true) + return MakeChainDatabase(ctx, stack, readonly) } func IsNetworkPreset(ctx *cli.Context) bool { @@ -2142,7 +2140,7 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis { func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockChain, ethdb.Database) { var ( gspec = MakeGenesis(ctx) - chainDb = MakeChainDatabase(ctx, stack, readonly, false) + chainDb = MakeChainDatabase(ctx, stack, readonly) ) config, err := core.LoadChainConfig(chainDb, gspec) if err != nil {