From 2f349da4bf1cf356428e7957a37f267055cad1cc Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Fri, 7 Mar 2025 13:18:49 +0800 Subject: [PATCH] cmd: remove deprecated lightchaindata db (#30527) --- cmd/XDC/chaincmd.go | 21 ++++++++++----------- cmd/XDC/dbcmd.go | 13 ++++++------- cmd/utils/flags.go | 6 +----- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/cmd/XDC/chaincmd.go b/cmd/XDC/chaincmd.go index 0be0df8c28..e43319bdcc 100644 --- a/cmd/XDC/chaincmd.go +++ b/cmd/XDC/chaincmd.go @@ -206,18 +206,17 @@ func initGenesis(ctx *cli.Context) error { stack, _ := makeFullNode(ctx) defer stack.Close() - for _, name := range []string{"chaindata", "lightchaindata"} { - chaindb, err := stack.OpenDatabase(name, 0, 0, "", false) - if err != nil { - utils.Fatalf("Failed to open database: %v", err) - } - _, hash, err := core.SetupGenesisBlock(chaindb, genesis) - if err != nil { - utils.Fatalf("Failed to write genesis block: %v", err) - } - chaindb.Close() - log.Info("Successfully wrote genesis state", "database", name, "hash", hash) + name := "chaindata" + chaindb, err := stack.OpenDatabase(name, 0, 0, "", false) + if err != nil { + utils.Fatalf("Failed to open database: %v", err) } + _, hash, err := core.SetupGenesisBlock(chaindb, genesis) + if err != nil { + utils.Fatalf("Failed to write genesis block: %v", err) + } + chaindb.Close() + log.Info("Successfully wrote genesis state", "database", name, "hash", hash) return nil } diff --git a/cmd/XDC/dbcmd.go b/cmd/XDC/dbcmd.go index cec7925ca2..ed66025cf3 100644 --- a/cmd/XDC/dbcmd.go +++ b/cmd/XDC/dbcmd.go @@ -148,13 +148,12 @@ WARNING: This is a low-level operation which may cause database corruption!`, func removeDB(ctx *cli.Context) error { stack, _ := makeConfigNode(ctx) - for _, name := range []string{"chaindata", "lightchaindata"} { - dbdir := stack.ResolvePath(name) - if common.FileExist(dbdir) { - confirmAndRemoveDB(dbdir, name) - } else { - log.Info("Database doesn't exist, skipping", "path", dbdir) - } + name := "chaindata" + dbdir := stack.ResolvePath(name) + if common.FileExist(dbdir) { + confirmAndRemoveDB(dbdir, name) + } else { + log.Info("Database doesn't exist, skipping", "path", dbdir) } return nil } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5ac1aa3029..f22aefd285 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1565,11 +1565,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb. cache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100 handles = MakeDatabaseHandles(ctx.Int(FDLimitFlag.Name)) ) - name := "chaindata" - if ctx.String(SyncModeFlag.Name) == "light" { - name = "lightchaindata" - } - chainDb, err := stack.OpenDatabase(name, cache, handles, "", readonly) + chainDb, err := stack.OpenDatabase("chaindata", cache, handles, "", readonly) if err != nil { Fatalf("Could not open database: %v", err) }