Merge pull request tendermint#11 from BiJie/BlockTimeIota_config_fix

disable BlockTimeIota
rickyyangz · Nov 23, 2018 · 4f6dfec · 4f6dfec
2 parents 6fad36f + 2367603
commit 4f6dfec
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 9 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/config/config.go b/config/config.go
@@ -490,7 +490,7 @@ func DefaultConsensusConfig() *ConsensusConfig {
 		CreateEmptyBlocksInterval:   0,
 		PeerGossipSleepDuration:     10,
 		PeerQueryMaj23SleepDuration: 2000,
-		BlockTimeIota:               1000,
+		BlockTimeIota:               0,
 	}
 }
 

diff --git a/config/toml.go b/config/toml.go
@@ -241,6 +241,9 @@ create_empty_blocks_interval = {{ .Consensus.CreateEmptyBlocksInterval }}
 peer_gossip_sleep_duration = {{ .Consensus.PeerGossipSleepDuration }}
 peer_query_maj23_sleep_duration = {{ .Consensus.PeerQueryMaj23SleepDuration }}
 
+# Block time parameters. Corresponds to the minimum time increment between consecutive blocks.
+blocktime_iota = "{{ .Consensus.BlockTimeIota }}"
+
 ##### transactions indexer configuration options #####
 [tx_index]
 

diff --git a/docs/tendermint-core/configuration.md b/docs/tendermint-core/configuration.md
@@ -184,6 +184,9 @@ create_empty_blocks_interval = 0
 peer_gossip_sleep_duration = 100
 peer_query_maj23_sleep_duration = 2000
 
+# Block time parameters. Corresponds to the minimum time increment between consecutive blocks.
+blocktime_iota = "0ms"
+
 ##### transactions indexer configuration options #####
 [tx_index]