ssvlabs · liorrutenberg · Mar 9, 2023 · Feb 14, 2023 · Feb 15, 2023 · Feb 15, 2023
diff --git a/qbft/spectest/all_tests.go b/qbft/spectest/all_tests.go
@@ -134,7 +134,7 @@ var AllTests = []SpecTest{
 	//startinstance.Valid(),
 	//startinstance.EmptyValue(),
 	//startinstance.NilValue(),
-	////startinstance.PostFutureDecided(), // TODO: fix panic
+	//startinstance.PostFutureDecided(),
 	//startinstance.FirstHeight(),
 	//startinstance.PreviousDecided(),
 	//startinstance.PreviousNotDecided(),
@@ -146,7 +146,6 @@ var AllTests = []SpecTest{
 	//proposer.ThirteenOperators(),
 	//
 	//messages.RoundChangeDataInvalidJustifications(),
-	//messages.RoundChangeDataInvalidPreparedRound(),
 	//messages.RoundChangePrePreparedJustifications(),
 	//messages.RoundChangeNotPreparedJustifications(),
 	//messages.CommitDataEncoding(),
@@ -155,8 +154,6 @@ var AllTests = []SpecTest{
 	//messages.MsgTypeUnknown(),
 	//messages.PrepareDataEncoding(),
 	//messages.ProposeDataEncoding(),
-	//messages.SignedMsgSigTooShort(),
-	//messages.SignedMsgSigTooLong(),
 	//messages.SignedMsgNoSigners(),
 	//messages.SignedMsgDuplicateSigners(),
 	//messages.SignedMsgMultiSigners(),
@@ -187,9 +184,8 @@ var AllTests = []SpecTest{
 	//proposal.PreparedPreviouslyJustification(),
 	//proposal.DifferentJustifications(),
 	//proposal.JustificationsNotHeighest(),
-	//proposal.JustificationsValueNotJustified(),
 	//proposal.DuplicateMsg(),
-	//proposal.DuplicateMsgDifferentValue(),
+	//proposal.DuplicateMsgDifferentRoot(),
 	//proposal.FirstRoundJustification(),
 	//proposal.FutureRoundPrevNotPrepared(),
 	//proposal.FutureRound(),
@@ -217,7 +213,6 @@ var AllTests = []SpecTest{
 	//
 	//prepare.DuplicateMsg(),
 	//prepare.HappyFlow(),
-	//prepare.InvalidPrepareData(),
 	//prepare.MultiSigner(),
 	//prepare.NoPreviousProposal(),
 	//prepare.OldRound(),
@@ -233,7 +228,6 @@ var AllTests = []SpecTest{
 	//commit.PastRound(),
 	//commit.DuplicateMsg(),
 	//commit.HappyFlow(),
-	//commit.InvalidCommitData(),
 	//commit.PostDecided(),
 	//commit.WrongData1(),
 	//commit.WrongData2(),
@@ -256,15 +250,12 @@ var AllTests = []SpecTest{
 	//roundchange.QuorumPrepared(),
 	//roundchange.PeerPrepared(),
 	//roundchange.PeerPreparedDifferentHeights(),
-	//roundchange.JustificationWrongValue(),
 	//roundchange.JustificationWrongRound(),
 	//roundchange.JustificationNoQuorum(),
 	//roundchange.JustificationMultiSigners(),
 	//roundchange.JustificationInvalidSig(),
 	//roundchange.JustificationInvalidRound(),
-	//roundchange.JustificationInvalidPrepareData(),
 	//roundchange.JustificationDuplicateMsg(),
-	//roundchange.InvalidRoundChangeData(),
 	//roundchange.F1DifferentFutureRounds(),
 	//roundchange.F1DifferentFutureRoundsNotPrepared(),
 	//roundchange.PastRound(),

diff --git a/qbft/spectest/tests/commit/invalid_commit_data.go b/qbft/spectest/tests/commit/invalid_commit_data.go
diff --git a/qbft/spectest/tests/controller/decided/current_instance.go b/qbft/spectest/tests/controller/decided/current_instance.go
@@ -32,7 +32,7 @@ func CurrentInstance() *tests.ControllerSpecTest {
 					DecidedCnt: 1,
 					DecidedVal: testingutils.TestingQBFTFullData,
 				},
-				ControllerPostRoot: "12fb900494537e891f774dacdfc1ea1ae9e11fdb099221eed157b0b517672cae",
+				ControllerPostRoot: "9a5519c1584d326e7c20cb1a824af5dc7139bac2f4d1ced2ff13b5aacfe9ab33",
 			},
 		},
 	}

diff --git a/qbft/spectest/tests/controller/decided/invalid_val_check.go b/qbft/spectest/tests/controller/decided/invalid_val_check.go
@@ -1,6 +1,7 @@
 package decided
 
 import (
+	"crypto/sha256"
 	"github.com/bloxapp/ssv-spec/qbft"
 	"github.com/bloxapp/ssv-spec/qbft/spectest/tests"
 	"github.com/bloxapp/ssv-spec/types"
@@ -17,14 +18,21 @@ func InvalidValCheckData() *tests.ControllerSpecTest {
 			{
 				InputValue: []byte{1, 2, 3, 4},
 				InputMessages: []*qbft.SignedMessage{
-					// how to pass invalid value?
-					testingutils.TestingCommitMultiSignerMessage([]*bls.SecretKey{ks.Shares[1], ks.Shares[2], ks.Shares[3]}, []types.OperatorID{1, 2, 3}),
+					testingutils.TestingCommitMultiSignerMessageWithParams(
+						[]*bls.SecretKey{ks.Shares[1], ks.Shares[2], ks.Shares[3]},
+						[]types.OperatorID{1, 2, 3},
+						qbft.FirstRound,
+						qbft.FirstHeight,
+						testingutils.TestingIdentifier,
+						sha256.Sum256(testingutils.TestingInvalidValueCheck),
+						testingutils.TestingInvalidValueCheck,
+					),
 				},
 				ExpectedDecidedState: tests.DecidedState{
 					DecidedCnt: 1,
 					DecidedVal: testingutils.TestingInvalidValueCheck,
 				},
-				ControllerPostRoot: "befc8626cb71ca1b8493d41f54a709b22bbf530302177b8668fd77562ca3040e",
+				ControllerPostRoot: "c7420429b97ed92ad8f21bdef11421c74d86c5d93131a8942d825d1c0aab969c",
 			},
 		},
 	}

diff --git a/qbft/spectest/tests/controller/decided/late_decided.go b/qbft/spectest/tests/controller/decided/late_decided.go
@@ -12,7 +12,7 @@ import (
 func LateDecided() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingCommitMultiSignerMessage([]*bls.SecretKey{ks.Shares[1], ks.Shares[2], ks.Shares[4]}, []types.OperatorID{1, 2, 4}))
 	return &tests.ControllerSpecTest{
 		Name: "decide late decided",

diff --git a/qbft/spectest/tests/controller/decided/late_decided_bigger_quorum.go b/qbft/spectest/tests/controller/decided/late_decided_bigger_quorum.go
@@ -12,7 +12,7 @@ import (
 func LateDecidedBiggerQuorum() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingCommitMultiSignerMessage([]*bls.SecretKey{ks.Shares[1], ks.Shares[2], ks.Shares[3], ks.Shares[4]}, []types.OperatorID{1, 2, 3, 4}))
 	return &tests.ControllerSpecTest{
 		Name: "decide late decided bigger quorum",

diff --git a/qbft/spectest/tests/controller/futuremsg/no_signers.go b/qbft/spectest/tests/controller/futuremsg/no_signers.go
@@ -11,7 +11,7 @@ func NoSigners() *ControllerSyncSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msg := testingutils.TestingPrepareMessageWithParams(
-		ks.Shares[3], 3, 3, 10, testingutils.DefaultIdentifier, testingutils.TestingQBFTRootData)
+		ks.Shares[3], 3, 3, 10, testingutils.TestingIdentifier, testingutils.TestingQBFTRootData)
 	msg.Signers = []types.OperatorID{}
 
 	return &ControllerSyncSpecTest{

diff --git a/qbft/spectest/tests/controller/futuremsg/unknown_signer.go b/qbft/spectest/tests/controller/futuremsg/unknown_signer.go
@@ -11,7 +11,7 @@ func UnknownSigner() *ControllerSyncSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msg := testingutils.TestingPrepareMessageWithParams(ks.Shares[3], 3, 3, 10,
-		testingutils.DefaultIdentifier, testingutils.TestingQBFTRootData)
+		testingutils.TestingIdentifier, testingutils.TestingQBFTRootData)
 	msg.Signers = []types.OperatorID{10}
 
 	return &ControllerSyncSpecTest{

diff --git a/qbft/spectest/tests/controller/futuremsg/wrong_sig.go b/qbft/spectest/tests/controller/futuremsg/wrong_sig.go
@@ -13,7 +13,7 @@ func WrongSig() *ControllerSyncSpecTest {
 		Name: "future msg wrong sig",
 		InputMessages: []*qbft.SignedMessage{
 			testingutils.TestingPrepareMessageWithParams(ks.Shares[3], 2, 3, 10,
-				testingutils.DefaultIdentifier, testingutils.TestingQBFTRootData),
+				testingutils.TestingIdentifier, testingutils.TestingQBFTRootData),
 		},
 		SyncDecidedCalledCnt: 0,
 		ControllerPostRoot:   "6bd17213f8e308190c4ebe49a22ec00c91ffd4c91a5515583391e9977423370f",

diff --git a/qbft/spectest/tests/controller/latemsg/late_commit.go b/qbft/spectest/tests/controller/latemsg/late_commit.go
@@ -13,7 +13,7 @@ func LateCommit() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingCommitMessage(ks.Shares[4], types.OperatorID(4)))
 
 	return &tests.ControllerSpecTest{

diff --git a/qbft/spectest/tests/controller/latemsg/late_commit_past_instance.go b/qbft/spectest/tests/controller/latemsg/late_commit_past_instance.go
@@ -13,7 +13,7 @@ func LateCommitPastInstance() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	allMsgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, 5, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, 5, ks)
 
 	msgPerHeight := make(map[qbft.Height][]*qbft.SignedMessage)
 	msgPerHeight[qbft.FirstHeight] = allMsgs[0:7]

diff --git a/qbft/spectest/tests/controller/latemsg/late_prepare.go b/qbft/spectest/tests/controller/latemsg/late_prepare.go
@@ -13,7 +13,7 @@ func LatePrepare() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingPrepareMessage(ks.Shares[4], 4))
 
 	return &tests.ControllerSpecTest{

diff --git a/qbft/spectest/tests/controller/latemsg/late_prepare_past_instance.go b/qbft/spectest/tests/controller/latemsg/late_prepare_past_instance.go
@@ -13,7 +13,7 @@ func LatePreparePastInstance() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	allMsgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, 5, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, 5, ks)
 
 	msgPerHeight := make(map[qbft.Height][]*qbft.SignedMessage)
 	msgPerHeight[qbft.FirstHeight] = allMsgs[0:7]

diff --git a/qbft/spectest/tests/controller/latemsg/late_proposal.go b/qbft/spectest/tests/controller/latemsg/late_proposal.go
@@ -13,7 +13,7 @@ func LateProposal() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingProposalMessage(ks.Shares[1], 1))
 
 	return &tests.ControllerSpecTest{

diff --git a/qbft/spectest/tests/controller/latemsg/late_proposal_past_instance.go b/qbft/spectest/tests/controller/latemsg/late_proposal_past_instance.go
@@ -13,7 +13,7 @@ func LateProposalPastInstance() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	allMsgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, 5, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, 5, ks)
 
 	msgPerHeight := make(map[qbft.Height][]*qbft.SignedMessage)
 	msgPerHeight[qbft.FirstHeight] = allMsgs[0:7]

diff --git a/qbft/spectest/tests/controller/latemsg/late_round_change.go b/qbft/spectest/tests/controller/latemsg/late_round_change.go
@@ -13,7 +13,7 @@ func LateRoundChange() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	msgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks)
 	msgs = append(msgs, testingutils.TestingRoundChangeMessage(ks.Shares[4], 4))
 
 	return &tests.ControllerSpecTest{

diff --git a/qbft/spectest/tests/controller/latemsg/late_round_change_past_instance.go b/qbft/spectest/tests/controller/latemsg/late_round_change_past_instance.go
@@ -13,7 +13,7 @@ func LateRoundChangePastInstance() *tests.ControllerSpecTest {
 	ks := testingutils.Testing4SharesSet()
 
 	allMsgs := testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-		testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, 5, ks)
+		testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, 5, ks)
 
 	msgPerHeight := make(map[qbft.Height][]*qbft.SignedMessage)
 	msgPerHeight[qbft.FirstHeight] = allMsgs[0:7]

diff --git a/qbft/spectest/tests/controller/processmsg/full_decided.go b/qbft/spectest/tests/controller/processmsg/full_decided.go
@@ -17,7 +17,7 @@ func FullDecided() *tests.ControllerSpecTest {
 			{
 				InputValue: testingutils.TestingQBFTFullData,
 				InputMessages: testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-					testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks),
+					testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks),
 				ExpectedDecidedState: tests.DecidedState{
 					DecidedVal: testingutils.TestingQBFTFullData,
 					DecidedCnt: 1,

diff --git a/qbft/spectest/tests/controller/processmsg/saved_broadcasted_decided.go b/qbft/spectest/tests/controller/processmsg/saved_broadcasted_decided.go
@@ -17,7 +17,7 @@ func BroadcastedDecided() *tests.ControllerSpecTest {
 			{
 				InputValue: []byte{1, 2, 3, 4},
 				InputMessages: testingutils.DecidingMsgsForHeightWithRoot(testingutils.TestingQBFTRootData,
-					testingutils.TestingQBFTFullData, testingutils.DefaultIdentifier, qbft.FirstHeight, ks),
+					testingutils.TestingQBFTFullData, testingutils.TestingIdentifier, qbft.FirstHeight, ks),
 				ExpectedDecidedState: tests.DecidedState{
 					DecidedVal: testingutils.TestingQBFTFullData,
 					DecidedCnt: 1,

diff --git a/qbft/spectest/tests/messages/rc_invalid_prepared_round.go b/qbft/spectest/tests/messages/rc_invalid_prepared_round.go
diff --git a/qbft/spectest/tests/messages/signature_too_long.go b/qbft/spectest/tests/messages/signature_too_long.go
diff --git a/qbft/spectest/tests/messages/signature_too_short.go b/qbft/spectest/tests/messages/signature_too_short.go
diff --git a/qbft/spectest/tests/messages_spectest.go b/qbft/spectest/tests/messages_spectest.go
@@ -25,7 +25,7 @@ func (test *MsgSpecTest) Run(t *testing.T) {
 			continue
 		}
 
-		if msg.Message.MsgType == qbft.RoundChangeMsgType && len(msg.Message.RoundChangeJustification) == 0 {
+		if msg.Message.RoundChangePrepared() && len(msg.Message.RoundChangeJustification) == 0 {
 			lastErr = errors.New("round change justification invalid")
 		}
 

diff --git a/qbft/spectest/tests/prepare/invalid_prepare_data.go b/qbft/spectest/tests/prepare/invalid_prepare_data.go