Skip to content

Commit 429e821

Browse files
authored
cmd/utils: fix formatting for beacon flag errors to fit Fatalf form (#32090)
Noticed that the errors for the blsync flags were not formatted correctly for `Fatalf(..)`.
1 parent cafa5e6 commit 429e821

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cmd/utils/flags.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,11 +1891,11 @@ func MakeBeaconLightConfig(ctx *cli.Context) bparams.ClientConfig {
18911891
if c, err := hexutil.Decode(ctx.String(BeaconGenesisRootFlag.Name)); err == nil && len(c) <= 32 {
18921892
copy(config.GenesisValidatorsRoot[:len(c)], c)
18931893
} else {
1894-
Fatalf("Invalid hex string", "beacon.genesis.gvroot", ctx.String(BeaconGenesisRootFlag.Name), "error", err)
1894+
Fatalf("Could not parse --%s: %v", BeaconGenesisRootFlag.Name, err)
18951895
}
18961896
configFile := ctx.String(BeaconConfigFlag.Name)
18971897
if err := config.ChainConfig.LoadForks(configFile); err != nil {
1898-
Fatalf("Could not load beacon chain config", "file", configFile, "error", err)
1898+
Fatalf("Could not load beacon chain config '%s': %v", configFile, err)
18991899
}
19001900
log.Info("Using custom beacon chain config", "file", configFile)
19011901
} else {
@@ -1912,17 +1912,17 @@ func MakeBeaconLightConfig(ctx *cli.Context) bparams.ClientConfig {
19121912
// are saved to the specified file.
19131913
if ctx.IsSet(BeaconCheckpointFileFlag.Name) {
19141914
if _, err := config.SetCheckpointFile(ctx.String(BeaconCheckpointFileFlag.Name)); err != nil {
1915-
Fatalf("Could not load beacon checkpoint file", "beacon.checkpoint.file", ctx.String(BeaconCheckpointFileFlag.Name), "error", err)
1915+
Fatalf("Could not load beacon checkpoint file '%s': %v", ctx.String(BeaconCheckpointFileFlag.Name), err)
19161916
}
19171917
}
19181918
if ctx.IsSet(BeaconCheckpointFlag.Name) {
19191919
hex := ctx.String(BeaconCheckpointFlag.Name)
19201920
c, err := hexutil.Decode(hex)
19211921
if err != nil {
1922-
Fatalf("Invalid hex string", "beacon.checkpoint", hex, "error", err)
1922+
Fatalf("Could not parse --%s: %v", BeaconCheckpointFlag.Name, err)
19231923
}
19241924
if len(c) != 32 {
1925-
Fatalf("Invalid hex string length", "beacon.checkpoint", hex, "length", len(c))
1925+
Fatalf("Could not parse --%s: invalid length %d, want 32", BeaconCheckpointFlag.Name, len(c))
19261926
}
19271927
copy(config.Checkpoint[:len(c)], c)
19281928
}

0 commit comments

Comments
 (0)