Fix MarshalJustifications and MarshalJustificationsWithFullData

qbft/spectest/all_tests.go

@@ -117,7 +117,7 @@ var AllTests = []SpecTest{
 	messages.CreateRoundChangePreviouslyPrepared(),
 	messages.RoundChangeDataEncoding(),
 	messages.SignedMessageSigner0(),
-	messages.MarshalJustifications(),
+	messages.MarshalJustificationsWithoutFullData(),
 	messages.MarshalJustificationsWithFullData(),
 	messages.UnmarshalJustifications(),
 

qbft/spectest/tests/messages/marshal_justification_with_full_data.go

@@ -11,12 +11,17 @@ import (
 func MarshalJustificationsWithFullData() *tests.MsgSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
-	encodedRCMsg, _ := testingutils.TestingRoundChangeMessageWithRound(ks.Shares[1], 1, 2).MarshalSSZ()
-	encodedPrepareMsg, _ := testingutils.TestingPrepareMessage(ks.Shares[1], types.OperatorID(1)).MarshalSSZ()
+	rcMsgs := []*qbft.SignedMessage{
+		testingutils.TestingRoundChangeMessageWithRound(ks.Shares[1], 1, 2),
+	}
+
+	prepareMsgs := []*qbft.SignedMessage{
+		testingutils.TestingPrepareMessage(ks.Shares[1], types.OperatorID(1)),
+	}
 
 	msg := testingutils.TestingProposalMessageWithParams(
 		ks.Shares[1], types.OperatorID(1), 2, qbft.FirstHeight, testingutils.TestingQBFTRootData,
-		[][]byte{encodedRCMsg}, [][]byte{encodedPrepareMsg})
+		testingutils.MarshalJustifications(rcMsgs), testingutils.MarshalJustifications(prepareMsgs))
 
 	r, _ := msg.GetRoot()
 	b, _ := msg.Encode()

qbft/spectest/tests/messages/marshal_justification.go → qbft/spectest/tests/messages/marshal_justification_without_full_data.go

@@ -7,16 +7,16 @@ import (
 	"github.com/bloxapp/ssv-spec/types/testingutils"
 )
 
-// MarshalJustifications tests marshalling justifications
-func MarshalJustifications() *tests.MsgSpecTest {
+// MarshalJustificationsWithoutFullData tests marshalling justifications without full data.
+func MarshalJustificationsWithoutFullData() *tests.MsgSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	rcMsgs := []*qbft.SignedMessage{
-		testingutils.TestingRoundChangeMessageWithRound(ks.Shares[1], 1, 2),
+		testingutils.TestingRoundChangeMessageWithRoundAndFullData(ks.Shares[1], 1, 2, nil),
 	}
 
 	prepareMsgs := []*qbft.SignedMessage{
-		testingutils.TestingPrepareMessage(ks.Shares[1], types.OperatorID(1)),
+		testingutils.TestingPrepareMessageWithRoundAndFullData(ks.Shares[1], types.OperatorID(1), 1, nil),
 	}
 
 	msg := testingutils.TestingProposalMessageWithParams(

types/testingutils/qbft_msgs.go

@@ -188,6 +188,23 @@ var TestingPrepareMessageWithFullData = func(sk *bls.SecretKey, id types.Operato
 	ret.FullData = fullData
 	return ret
 }
+var TestingPrepareMessageWithRoundAndFullData = func(
+	sk *bls.SecretKey,
+	id types.OperatorID,
+	round qbft.Round,
+	fullData []byte,
+) *qbft.SignedMessage {
+	msg := &qbft.Message{
+		MsgType:    qbft.PrepareMsgType,
+		Height:     qbft.FirstHeight,
+		Round:      round,
+		Identifier: TestingIdentifier,
+		Root:       sha256.Sum256(fullData),
+	}
+	ret := SignQBFTMsg(sk, id, msg)
+	ret.FullData = fullData
+	return ret
+}
 var TestingPrepareMessageWithParams = func(
 	sk *bls.SecretKey,
 	id types.OperatorID,
@@ -348,6 +365,23 @@ var TestingRoundChangeMessageWithHeightAndIdentifier = func(sk *bls.SecretKey, i
 	ret.FullData = TestingQBFTFullData
 	return ret
 }
+var TestingRoundChangeMessageWithRoundAndFullData = func(
+	sk *bls.SecretKey,
+	id types.OperatorID,
+	round qbft.Round,
+	fullData []byte,
+) *qbft.SignedMessage {
+	msg := &qbft.Message{
+		MsgType:    qbft.RoundChangeMsgType,
+		Height:     qbft.FirstHeight,
+		Round:      round,
+		Identifier: TestingIdentifier,
+		Root:       sha256.Sum256(fullData),
+	}
+	ret := SignQBFTMsg(sk, id, msg)
+	ret.FullData = fullData
+	return ret
+}
 var TestingRoundChangeMessageWithParams = func(
 	sk *bls.SecretKey,
 	id types.OperatorID,