Merge PR #4624: Don't reject config files with create_empty_blocks=false

cosmos · Jun 26, 2019 · 3950017 · 3950017
1 parent 908c5cf
commit 3950017
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.pending/improvements/sdk/Revert-2284-https-gi 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
diff --git 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,