forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/utils: deprecate flag --XDCx-datadir

Browse source
This commit is contained in:
Daniel Liu 2025-02-14 09:58:49 +08:00
parent ff0c34486a
commit 7ea30d6b29
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cmd/utils/flags.go
View file

@ -785,13 +785,6 @@ var (
Usage: "Enable the XDCX protocol", Usage: "Enable the XDCX protocol",
Category: flags.XdcxCategory, Category: flags.XdcxCategory,
} }
XDCXDataDirFlag = &flags.DirectoryFlag{
Name: "XDCx-datadir",
Aliases: []string{"XDCx.datadir"},
Usage: "Data directory for the XDCX databases",
Value: flags.DirectoryString(filepath.Join(DataDirFlag.Value.String(), "XDCx")),
Category: flags.XdcxCategory,
}
XDCXDBEngineFlag = &cli.StringFlag{ XDCXDBEngineFlag = &cli.StringFlag{
Name: "XDCx-dbengine", Name: "XDCx-dbengine",
Aliases: []string{"XDCx.dbengine"}, Aliases: []string{"XDCx.dbengine"},
@ -1375,19 +1368,10 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
func SetXDCXConfig(ctx *cli.Context, cfg *XDCx.Config, XDCDataDir string) { func SetXDCXConfig(ctx *cli.Context, cfg *XDCx.Config, XDCDataDir string) {
if ctx.IsSet(XDCXDataDirFlag.Name) { if ctx.IsSet(XDCXDataDirFlag.Name) {
cfg.DataDir = ctx.String(XDCXDataDirFlag.Name) log.Warn("The flag XDCx-datadir or XDCx.datadir is deprecated, please remove this flag")
} else {
// default XDCx datadir: DATADIR/XDCx
defaultXDCXDataDir := filepath.Join(XDCDataDir, "XDCx")
filesInXDCXDefaultDir, _ := WalkMatch(defaultXDCXDataDir, "*.ldb")
filesInNodeDefaultDir, _ := WalkMatch(node.DefaultDataDir(), "*.ldb")
if len(filesInXDCXDefaultDir) == 0 && len(filesInNodeDefaultDir) > 0 {
cfg.DataDir = node.DefaultDataDir()
} else {
cfg.DataDir = defaultXDCXDataDir
}
} }
// XDCx datadir: XDCDataDir/XDCx
cfg.DataDir = filepath.Join(XDCDataDir, "XDCx")
log.Info("XDCX datadir", "path", cfg.DataDir) log.Info("XDCX datadir", "path", cfg.DataDir)
if ctx.IsSet(XDCXDBEngineFlag.Name) { if ctx.IsSet(XDCXDBEngineFlag.Name) {
cfg.DBEngine = ctx.String(XDCXDBEngineFlag.Name) cfg.DBEngine = ctx.String(XDCXDBEngineFlag.Name)

7
cmd/utils/flags_legacy.go
View file

@ -38,6 +38,7 @@ var DeprecatedFlags = []cli.Flag{
LogBacktraceAtFlag, LogBacktraceAtFlag,
LogDebugFlag, LogDebugFlag,
MiningEnabledFlag, MiningEnabledFlag,
XDCXDataDirFlag,
} }
var ( var (
@ -81,6 +82,12 @@ var (
Usage: "Enable mining (deprecated)", Usage: "Enable mining (deprecated)",
Category: flags.DeprecatedCategory, Category: flags.DeprecatedCategory,
} }
XDCXDataDirFlag = &flags.DirectoryFlag{
Name: "XDCx-datadir",
Aliases: []string{"XDCx.datadir"},
Usage: "Data directory for the XDCX databases (deprecated)",
Category: flags.DeprecatedCategory,
}
) )
// showDeprecated displays deprecated flags that will be soon removed from the codebase. // showDeprecated displays deprecated flags that will be soon removed from the codebase.