Cleanup

internal/consensus/common_test.go

@@ -41,7 +41,7 @@ const (
 	testSubscriber = "test-client"
 
 	// genesis, chain_id, priv_val
-	ensureTimeout = 200 * time.Millisecond
+	ensureTimeout = time.Millisecond * 200
 )
 
 // A cleanupFunc cleans up any config / test files created for a particular

internal/consensus/pbts_test.go

@@ -335,7 +335,7 @@ func TestProposerWaitsForGenesisTime(t *testing.T) {
 	cfg := pbtsTestConfiguration{
 		timingParams: types.TimingParams{
 			Precision:    10 * time.Millisecond,
-			MessageDelay: 100 * time.Millisecond,
+			MessageDelay: 10 * time.Millisecond,
 		},
 		timeoutPropose:             10 * time.Millisecond,
 		genesisTime:                initialTime,

internal/consensus/state.go

@@ -1317,10 +1317,7 @@ func (cs *State) proposalIsTimely(proposal *types.Proposal) bool {
 		MessageDelay: cs.state.ConsensusParams.Timing.MessageDelay,
 	}
 
-	if !proposal.IsTimely(tmtime.DefaultSource{}, tp, cs.state.InitialHeight) {
-		return false
-	}
-	return true
+	return proposal.IsTimely(tmtime.DefaultSource{}, tp, cs.state.InitialHeight)
 }
 
 func (cs *State) defaultDoPrevote(height int64, round int32) {