From 399bd4077b3947345f0061647d70c7c434c19cb7 Mon Sep 17 00:00:00 2001 From: Kishan Sagathiya Date: Fri, 12 Nov 2021 17:36:15 +0530 Subject: [PATCH 1/2] fix(cmd/cfg): Use default Babe Lead value from toml config Earlier, babe lead value was read only from "babe-lead" cli flag. cfg.BABELead was being set to false in case this flag was not provided. This commit sets cfg.BABELead from toml config and uses "babe-lead" cli flag only when it is set. --- cmd/gossamer/config.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/gossamer/config.go b/cmd/gossamer/config.go index 9f9a5394bf..90694dd297 100644 --- a/cmd/gossamer/config.go +++ b/cmd/gossamer/config.go @@ -581,7 +581,11 @@ func setDotCoreConfig(ctx *cli.Context, tomlCfg ctoml.CoreConfig, cfg *dot.CoreC cfg.BabeAuthority = tomlCfg.Roles == types.AuthorityRole cfg.GrandpaAuthority = tomlCfg.Roles == types.AuthorityRole cfg.GrandpaInterval = time.Second * time.Duration(tomlCfg.GrandpaInterval) - cfg.BABELead = ctx.GlobalBool(BABELeadFlag.Name) + + cfg.BABELead = tomlCfg.BABELead + if ctx.IsSet(BABELeadFlag.Name) { + cfg.BABELead = ctx.GlobalBool(BABELeadFlag.Name) + } // check --roles flag and update node configuration if roles := ctx.GlobalString(RolesFlag.Name); roles != "" { From 1219ffea6fd7849a959307a693d97a134515c5d1 Mon Sep 17 00:00:00 2001 From: Kishan Sagathiya Date: Mon, 15 Nov 2021 11:52:29 +0530 Subject: [PATCH 2/2] fix tests --- dot/config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/dot/config.go b/dot/config.go index 9126c25971..cb2a600397 100644 --- a/dot/config.go +++ b/dot/config.go @@ -333,6 +333,7 @@ func DevConfig() *Config { BabeAuthority: dev.DefaultBabeAuthority, GrandpaAuthority: dev.DefaultGrandpaAuthority, WasmInterpreter: dev.DefaultWasmInterpreter, + BABELead: dev.DefaultBabeAuthority, }, Network: NetworkConfig{ Port: dev.DefaultNetworkPort,