From 18936872a802660591556d7fcb53912c299f6898 Mon Sep 17 00:00:00 2001 From: Timothy Wu Date: Tue, 3 Oct 2023 13:27:05 -0400 Subject: [PATCH] lib(pkg): standalone `finality-grandpa` package (#3235) --- pkg/finality-grandpa/voter_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/finality-grandpa/voter_test.go b/pkg/finality-grandpa/voter_test.go index e8acb2a6f9..9a3ec1e635 100644 --- a/pkg/finality-grandpa/voter_test.go +++ b/pkg/finality-grandpa/voter_test.go @@ -296,7 +296,11 @@ func TestVoter_BroadcastCommitOnlyIfNewer(t *testing.T) { item := <-roundIn // wait for a prevote assert.NoError(t, item.Error) +<<<<<<< HEAD assert.IsType(t, Prevote[string, uint32]{}, item.SignedMessage.Message.Value) +======= + assert.IsType(t, Prevote[string, uint32]{}, item.SignedMessage.Message.value) +>>>>>>> 2dd16240a (lib(pkg): standalone `finality-grandpa` package (#3235)) assert.Equal(t, localID, item.SignedMessage.ID) // send our prevote and precommit @@ -310,7 +314,11 @@ waitForPrecommit: item = <-roundIn // wait for a precommit assert.NoError(t, item.Error) +<<<<<<< HEAD switch item.SignedMessage.Message.Value.(type) { +======= + switch item.SignedMessage.Message.value.(type) { +>>>>>>> 2dd16240a (lib(pkg): standalone `finality-grandpa` package (#3235)) case Precommit[string, uint32]: if item.SignedMessage.ID == localID { break waitForPrecommit