cmd: --consensus.no_empty_blocks

This commit is contained in:
Ethan Buchman
2017-07-13 15:08:00 -04:00
parent 678a9a2e42
commit e9a2389300
2 changed files with 4 additions and 2 deletions

View File

@ -45,6 +45,9 @@ func AddNodeFlags(cmd *cobra.Command) {
cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "Comma delimited host:port seed nodes") cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "Comma delimited host:port seed nodes")
cmd.Flags().Bool("p2p.skip_upnp", config.P2P.SkipUPNP, "Skip UPNP configuration") cmd.Flags().Bool("p2p.skip_upnp", config.P2P.SkipUPNP, "Skip UPNP configuration")
cmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, "Enable Peer-Exchange (dev feature)") cmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, "Enable Peer-Exchange (dev feature)")
// consensus flags
cmd.Flags().Bool("consensus.no_empty_blocks", config.Consensus.NoEmptyBlocks, "Prevent empty blocks from being proposed by correct processes")
} }
// Users wishing to: // Users wishing to:

View File

@ -359,7 +359,7 @@ func DefaultConsensusConfig() *ConsensusConfig {
SkipTimeoutCommit: false, SkipTimeoutCommit: false,
MaxBlockSizeTxs: 10000, MaxBlockSizeTxs: 10000,
MaxBlockSizeBytes: 1, // TODO MaxBlockSizeBytes: 1, // TODO
NoEmptyBlocks: true, NoEmptyBlocks: false,
BlockPartSize: types.DefaultBlockPartSize, // TODO: we shouldnt be importing types BlockPartSize: types.DefaultBlockPartSize, // TODO: we shouldnt be importing types
PeerGossipSleepDuration: 100, PeerGossipSleepDuration: 100,
PeerQueryMaj23SleepDuration: 2000, PeerQueryMaj23SleepDuration: 2000,
@ -377,7 +377,6 @@ func TestConsensusConfig() *ConsensusConfig {
config.TimeoutPrecommitDelta = 1 config.TimeoutPrecommitDelta = 1
config.TimeoutCommit = 10 config.TimeoutCommit = 10
config.SkipTimeoutCommit = true config.SkipTimeoutCommit = true
config.NoEmptyBlocks = false
return config return config
} }