From dccca055411d530d2a95d395d7b1e6773105342b Mon Sep 17 00:00:00 2001 From: William Banfield Date: Mon, 29 Nov 2021 18:07:28 -0500 Subject: [PATCH] lint++ --- internal/consensus/pbts_test.go | 4 +++- internal/consensus/state.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/consensus/pbts_test.go b/internal/consensus/pbts_test.go index 6d4eef563..308b312eb 100644 --- a/internal/consensus/pbts_test.go +++ b/internal/consensus/pbts_test.go @@ -187,7 +187,9 @@ func (p *pbtsTestHarness) nextHeight(proposer types.PrivValidator, deliverTime, func collectResults(ctx context.Context, t *testing.T, eb *eventbus.EventBus, address []byte) <-chan heightResult { t.Helper() resultCh := make(chan heightResult) - voteSub, err := eb.SubscribeWithArgs(ctx, tmpubsub.SubscribeArgs{ClientID: "voteSubscriber", Query: types.EventQueryVote}) + voteSub, err := eb.SubscribeWithArgs(ctx, tmpubsub.SubscribeArgs{ + ClientID: "voteSubscriber", + Query: types.EventQueryVote}) require.NoError(t, err) go func() { var res heightResult diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 18cf8e46e..8c553db9b 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1119,9 +1119,11 @@ func (cs *State) enterPropose(height int64, round int32) { } }() - // If we don't get the proposal and all block parts quick enough, enterPrevote + //nolint: lll waitingTime := proposalStepWaitingTime(tmtime.DefaultSource{}, cs.state.LastBlockTime, cs.state.ConsensusParams.Timestamp) proposalTimeout := maxDuration(cs.config.Propose(round), waitingTime) + + // If we don't get the proposal and all block parts quick enough, enterPrevote cs.scheduleTimeout(proposalTimeout, height, round, cstypes.RoundStepPropose) // Nothing more to do if we're not a validator