Skip to content

Commit b1f9245

Browse files
committed
cmd: remove deprecated lightchaindata db (30527)
1 parent 5e81197 commit b1f9245

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

cmd/XDC/chaincmd.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,18 +206,17 @@ func initGenesis(ctx *cli.Context) error {
206206
stack, _ := makeFullNode(ctx)
207207
defer stack.Close()
208208

209-
for _, name := range []string{"chaindata", "lightchaindata"} {
210-
chaindb, err := stack.OpenDatabase(name, 0, 0, "", false)
211-
if err != nil {
212-
utils.Fatalf("Failed to open database: %v", err)
213-
}
214-
_, hash, err := core.SetupGenesisBlock(chaindb, genesis)
215-
if err != nil {
216-
utils.Fatalf("Failed to write genesis block: %v", err)
217-
}
218-
chaindb.Close()
219-
log.Info("Successfully wrote genesis state", "database", name, "hash", hash)
209+
name := "chaindata"
210+
chaindb, err := stack.OpenDatabase(name, 0, 0, "", false)
211+
if err != nil {
212+
utils.Fatalf("Failed to open database: %v", err)
213+
}
214+
_, hash, err := core.SetupGenesisBlock(chaindb, genesis)
215+
if err != nil {
216+
utils.Fatalf("Failed to write genesis block: %v", err)
220217
}
218+
chaindb.Close()
219+
log.Info("Successfully wrote genesis state", "database", name, "hash", hash)
221220
return nil
222221
}
223222

cmd/XDC/dbcmd.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,12 @@ WARNING: This is a low-level operation which may cause database corruption!`,
148148

149149
func removeDB(ctx *cli.Context) error {
150150
stack, _ := makeConfigNode(ctx)
151-
for _, name := range []string{"chaindata", "lightchaindata"} {
152-
dbdir := stack.ResolvePath(name)
153-
if common.FileExist(dbdir) {
154-
confirmAndRemoveDB(dbdir, name)
155-
} else {
156-
log.Info("Database doesn't exist, skipping", "path", dbdir)
157-
}
151+
name := "chaindata"
152+
dbdir := stack.ResolvePath(name)
153+
if common.FileExist(dbdir) {
154+
confirmAndRemoveDB(dbdir, name)
155+
} else {
156+
log.Info("Database doesn't exist, skipping", "path", dbdir)
158157
}
159158
return nil
160159
}

cmd/utils/flags.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,11 +1565,7 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.
15651565
cache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheDatabaseFlag.Name) / 100
15661566
handles = MakeDatabaseHandles(ctx.Int(FDLimitFlag.Name))
15671567
)
1568-
name := "chaindata"
1569-
if ctx.String(SyncModeFlag.Name) == "light" {
1570-
name = "lightchaindata"
1571-
}
1572-
chainDb, err := stack.OpenDatabase(name, cache, handles, "", readonly)
1568+
chainDb, err := stack.OpenDatabase("chaindata", cache, handles, "", readonly)
15731569
if err != nil {
15741570
Fatalf("Could not open database: %v", err)
15751571
}

0 commit comments

Comments
 (0)