From 3950017bd9b75deeb4faa62ec5e5def04b4e9616 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 26 Jun 2019 14:30:35 +0200 Subject: [PATCH] Merge PR #4624: Don't reject config files with create_empty_blocks=false --- .pending/improvements/sdk/Revert-2284-https-gi | 1 + server/util.go | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) create mode 100644 .pending/improvements/sdk/Revert-2284-https-gi diff --git a/.pending/improvements/sdk/Revert-2284-https-gi b/.pending/improvements/sdk/Revert-2284-https-gi new file mode 100644 index 0000000000..1d80c755a5 --- /dev/null +++ b/.pending/improvements/sdk/Revert-2284-https-gi @@ -0,0 +1 @@ +Revert (#2284)[https://github.com/cosmos/cosmos-sdk/pull/2284] to allow create_empty_blocks in the config \ No newline at end of file diff --git a/server/util.go b/server/util.go index f69d11ebfb..0ac0ff657c 100644 --- a/server/util.go +++ b/server/util.go @@ -58,10 +58,6 @@ func PersistentPreRunEFn(context *Context) func(*cobra.Command, []string) error if err != nil { return err } - err = validateConfig(config) - if err != nil { - return err - } logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) logger, err = tmflags.ParseLogLevel(config.LogLevel, logger, cfg.DefaultLogLevel()) if err != nil { @@ -117,14 +113,6 @@ func interceptLoadConfig() (conf *cfg.Config, err error) { return } -// validate the config with the sdk's requirements. -func validateConfig(conf *cfg.Config) error { - if !conf.Consensus.CreateEmptyBlocks { - return errors.New("config option CreateEmptyBlocks = false is currently unsupported") - } - return nil -} - // add server commands func AddCommands( ctx *Context, cdc *codec.Codec,