Skip to content

Commit 2374076

Browse files
committed
cmd: rename genesis flag to override.genesis
1 parent caf1b2a commit 2374076

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

cmd/geth/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ var (
6666
utils.OverrideBPO1,
6767
utils.OverrideBPO2,
6868
utils.OverrideVerkle,
69+
utils.OverrideGenesisFlag,
6970
utils.EnablePersonal, // deprecated
7071
utils.TxPoolLocalsFlag,
7172
utils.TxPoolNoLocalsFlag,
@@ -84,7 +85,6 @@ var (
8485
utils.SyncModeFlag,
8586
utils.SyncTargetFlag,
8687
utils.ExitWhenSyncedFlag,
87-
utils.GenesisFlag,
8888
utils.GCModeFlag,
8989
utils.SnapshotFlag,
9090
utils.TxLookupLimitFlag, // deprecated

cmd/utils/flags.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ var (
190190
Usage: "Exits after block synchronisation completes",
191191
Category: flags.EthCategory,
192192
}
193-
GenesisFlag = &cli.StringFlag{
194-
Name: "genesis",
195-
Usage: "Load genesis block and configuration from file at this path",
196-
Category: flags.EthCategory,
197-
}
198193

199194
// Dump command options.
200195
IterativeOutputFlag = &cli.BoolFlag{
@@ -267,6 +262,11 @@ var (
267262
Usage: "Manually specify the Verkle fork timestamp, overriding the bundled setting",
268263
Category: flags.EthCategory,
269264
}
265+
OverrideGenesisFlag = &cli.StringFlag{
266+
Name: "override.genesis",
267+
Usage: "Load genesis block and configuration from file at this path",
268+
Category: flags.EthCategory,
269+
}
270270
SyncModeFlag = &cli.StringFlag{
271271
Name: "syncmode",
272272
Usage: `Blockchain sync mode ("snap" or "full")`,
@@ -1598,7 +1598,7 @@ func setRequiredBlocks(ctx *cli.Context, cfg *ethconfig.Config) {
15981598
// SetEthConfig applies eth-related command line flags to the config.
15991599
func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
16001600
// Avoid conflicting network flags, don't allow network id override on preset networks
1601-
flags.CheckExclusive(ctx, MainnetFlag, DeveloperFlag, SepoliaFlag, HoleskyFlag, HoodiFlag, NetworkIdFlag, GenesisFlag)
1601+
flags.CheckExclusive(ctx, MainnetFlag, DeveloperFlag, SepoliaFlag, HoleskyFlag, HoodiFlag, NetworkIdFlag, OverrideGenesisFlag)
16021602
flags.CheckExclusive(ctx, DeveloperFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer
16031603

16041604
// Set configurations from CLI flags
@@ -1878,8 +1878,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
18781878
if !ctx.IsSet(MinerGasPriceFlag.Name) {
18791879
cfg.Miner.GasPrice = big.NewInt(1)
18801880
}
1881-
case ctx.String(GenesisFlag.Name) != "":
1882-
f, err := os.Open(ctx.String(GenesisFlag.Name))
1881+
case ctx.String(OverrideGenesisFlag.Name) != "":
1882+
f, err := os.Open(ctx.String(OverrideGenesisFlag.Name))
18831883
if err != nil {
18841884
Fatalf("Failed to read genesis file: %v", err)
18851885
}

0 commit comments

Comments
 (0)