lib(pkg): standalone finality-grandpa package (#3235)

ChainSafe · Apr 19, 2024 · 1893687 · 1893687
1 parent 0c632fe
commit 1893687
Showing 1 changed file with 8 additions and 0 deletions.
diff --git 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