From 06aa3e36b3016a2b365b9cdac1d3f12c783f5391 Mon Sep 17 00:00:00 2001 From: Kishan Sagathiya Date: Mon, 15 Nov 2021 12:40:50 +0530 Subject: [PATCH] fix(cmd/cfg): Use Babe Lead value from toml config (#2032) 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 +++++- dot/config.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/gossamer/config.go b/cmd/gossamer/config.go index ab516ff895..7f79f942a0 100644 --- a/cmd/gossamer/config.go +++ b/cmd/gossamer/config.go @@ -568,7 +568,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 != "" { 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,