From d0a39c267aae8caf0d4fb74370095cdf9ed2319a Mon Sep 17 00:00:00 2001 From: William Banfield Date: Thu, 2 Dec 2021 16:06:04 -0500 Subject: [PATCH] remove ensurePrecommit --- internal/consensus/common_test.go | 5 ----- internal/consensus/state_test.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index af78bf7be..784ca1c47 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -733,11 +733,6 @@ func ensureVote(t *testing.T, voteCh <-chan tmpubsub.Message, height int64, roun } } -func ensurePrecommitTimeout(t *testing.T, ch <-chan tmpubsub.Message) { - t.Helper() - ensureNoMessageBeforeTimeout(t, ch, ensureTimeout, "Timeout expired while waiting for the Precommit to Timeout") -} - func ensureNewEventOnChannel(t *testing.T, ch <-chan tmpubsub.Message) { t.Helper() ensureMessageBeforeTimeout(t, ch, ensureTimeout) diff --git a/internal/consensus/state_test.go b/internal/consensus/state_test.go index f88e40814..b3e88748f 100644 --- a/internal/consensus/state_test.go +++ b/internal/consensus/state_test.go @@ -2291,7 +2291,7 @@ func TestStartNextHeightCorrectlyAfterTimeout(t *testing.T) { signAddVotes(ctx, cs1, tmproto.PrecommitType, config.ChainID(), blockID, vs3) // wait till timeout occurs - ensurePrecommitTimeout(t, precommitTimeoutCh) + ensureNewTimeout(t, precommitTimeoutCh, height, round, cs1.config.TimeoutPrecommit.Nanoseconds()) ensureNewRound(t, newRoundCh, height, round+1)