From 87202a4fd381441fc49971e1c594c0b3fd7c468f Mon Sep 17 00:00:00 2001 From: William Banfield Date: Fri, 24 Sep 2021 12:19:47 -0400 Subject: [PATCH] fixes post merge --- internal/consensus/state_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/consensus/state_test.go b/internal/consensus/state_test.go index 6d4baa742..65e91fccd 100644 --- a/internal/consensus/state_test.go +++ b/internal/consensus/state_test.go @@ -42,7 +42,6 @@ x * TestStateLock_POLRelock - 4 vals, polka in round 1 and polka in round 2. Ensure validator updates locked round. x_*_TestStateLock_POLDoesNotUnlock 4 vals, one precommits, other 3 polka nil at next round, so we precommit nil but maintain lock ->>>>>>> wb/proposer-based-timestamps x * TestStateLock_MissingProposalWhenPOLSeenDoesNotUpdateLock - 4 vals, 1 misses proposal but sees POL. x * TestStateLock_MissingProposalWhenPOLSeenDoesNotUnlock - 4 vals, 1 misses proposal but sees POL. x * TestStateLock_POLSafety1 - 4 vals. We shouldn't change lock based on polka at earlier round @@ -1212,6 +1211,10 @@ func TestStateLock_MissingProposalWhenPOLSeenDoesNotUpdateLock(t *testing.T) { func TestStateLock_DoesNotLockOnOldProposal(t *testing.T) { config := configSetup(t) + cs1, vss := randState(config, 4) + vs2, vs3, vs4 := vss[1], vss[2], vss[3] + height, round := cs1.Height, cs1.Round + timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait) proposalCh := subscribe(cs1.eventBus, types.EventQueryCompleteProposal) pv1, err := cs1.privValidator.GetPubKey(context.Background())