From b955cc5ff71ade4b1f291ac74329a953bfe9fce1 Mon Sep 17 00:00:00 2001 From: Zsolt Felfoldi Date: Mon, 25 Mar 2024 08:58:26 +0100 Subject: [PATCH] beacon/blsync: simplified blsync cl param checks --- beacon/blsync/config.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/beacon/blsync/config.go b/beacon/blsync/config.go index e0a5f72b74..93ed81306c 100644 --- a/beacon/blsync/config.go +++ b/beacon/blsync/config.go @@ -72,27 +72,21 @@ var ( ) func makeChainConfig(ctx *cli.Context) lightClientConfig { - var ( - config lightClientConfig - predefConfig bool - ) + var config lightClientConfig customConfig := ctx.IsSet(utils.BeaconConfigFlag.Name) - utils.CheckExclusive(ctx, utils.MainnetFlag, utils.GoerliFlag, utils.SepoliaFlag) + utils.CheckExclusive(ctx, utils.MainnetFlag, utils.GoerliFlag, utils.SepoliaFlag, utils.BeaconConfigFlag) switch { case ctx.Bool(utils.MainnetFlag.Name): - config, predefConfig = MainnetConfig, true + config = MainnetConfig case ctx.Bool(utils.SepoliaFlag.Name): - config, predefConfig = SepoliaConfig, true + config = SepoliaConfig case ctx.Bool(utils.GoerliFlag.Name): - config, predefConfig = GoerliConfig, true + config = GoerliConfig default: if !customConfig { - config, predefConfig = MainnetConfig, true + config = MainnetConfig } } - if customConfig && predefConfig { - utils.Fatalf("Cannot use custom beacon chain config flags in combination with pre-defined network config") - } // Genesis root and time should always be specified together with custom chain config if customConfig { if !ctx.IsSet(utils.BeaconGenesisRootFlag.Name) {