forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/geth: shorten code

Browse source
This commit is contained in:
Felix Lange 2023-11-07 20:24:10 +01:00 committed by GitHub
parent 2ea25e38fc
commit a03cd96aa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/geth/chaincmd.go
View file

@ -224,18 +224,15 @@ func initGenesis(ctx *cli.Context) error {
} }
func dumpGenesis(ctx *cli.Context) error { func dumpGenesis(ctx *cli.Context) error {
// if there is a testnet preset enabled, dump that // check if there is a testnet preset enabled
var genesis *core.Genesis
if utils.IsNetworkPreset(ctx) { if utils.IsNetworkPreset(ctx) {
genesis := utils.MakeGenesis(ctx) genesis = utils.MakeGenesis(ctx)
if err := json.NewEncoder(os.Stdout).Encode(genesis); err != nil { } else if ctx.IsSet(utils.DeveloperFlag.Name) && !ctx.IsSet(utils.DataDirFlag.Name) {
utils.Fatalf("could not encode genesis: %s", err) genesis = core.DeveloperGenesisBlock(11_500_000, nil)
}
return nil
} }
// if a datadir isn't specified, dump a generic dev-mode compatible genesis configuration if genesis != nil {
if ctx.IsSet(utils.DeveloperFlag.Name) && !ctx.IsSet(utils.DataDirFlag.Name) {
genesis := core.DeveloperGenesisBlock(11_500_000, nil)
if err := json.NewEncoder(os.Stdout).Encode(genesis); err != nil { if err := json.NewEncoder(os.Stdout).Encode(genesis); err != nil {
utils.Fatalf("could not encode genesis: %s", err) utils.Fatalf("could not encode genesis: %s", err)
} }
@ -266,7 +263,7 @@ func dumpGenesis(ctx *cli.Context) error {
if ctx.IsSet(utils.DataDirFlag.Name) { if ctx.IsSet(utils.DataDirFlag.Name) {
utils.Fatalf("no existing datadir at %s", stack.Config().DataDir) utils.Fatalf("no existing datadir at %s", stack.Config().DataDir)
} }
utils.Fatalf("no network preset provided, no existing genesis in the default datadir") utils.Fatalf("no network preset provided, and no genesis exists in the default datadir")
return nil return nil
} }