Merge branch 'main' into test-share

ssvlabs · Jan 15, 2024 · 0cf502c · 0cf502c
2 parents f39a4ae + 1b367a0
commit 0cf502c
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 12 deletions.
diff --git a/types/spectest/all_tests.go b/types/spectest/all_tests.go
@@ -20,6 +20,8 @@ type SpecTest interface {
 
 var AllTests = []SpecTest{
 	ssvmsg.Encoding(),
+	ssvmsg.MsgIDBelongs(),
+	ssvmsg.MsgIDDoesntBelongs(),
 
 	partialsigmessage.Encoding(),
 

diff --git a/types/spectest/generate/tests.json b/types/spectest/generate/tests.json
diff --git a/types/spectest/run_test.go b/types/spectest/run_test.go
@@ -102,6 +102,12 @@ func TestJson(t *testing.T) {
 				typedTest := &share.ShareTest{}
 				require.NoError(t, json.Unmarshal(byts, &typedTest))
 				typedTest.Run(t)
+			case reflect.TypeOf(&ssvmsg.SSVMessageTest{}).String():
+				byts, err := json.Marshal(test)
+				require.NoError(t, err)
+				typedTest := &ssvmsg.SSVMessageTest{}
+				require.NoError(t, json.Unmarshal(byts, &typedTest))
+				typedTest.Run(t)
 			default:
 				t.Fatalf("unknown test")
 			}

diff --git a/types/spectest/tests/ssvmsg/msg_id_belongs.go b/types/spectest/tests/ssvmsg/msg_id_belongs.go
@@ -1,6 +1,20 @@
 package ssvmsg
 
+import (
+	"github.com/bloxapp/ssv-spec/types"
+	"github.com/bloxapp/ssv-spec/types/testingutils"
+)
+
 // MsgIDBelongs tests msg id belonging to validator id
-func MsgIDBelongs() SpecTest {
-	panic("implement")
+func MsgIDBelongs() *SSVMessageTest {
+	return &SSVMessageTest{
+		Name: "belongs",
+		MessageIDs: []types.MessageID{
+			types.NewMsgID(testingutils.TestingSSVDomainType, testingutils.TestingValidatorPubKey[:], types.BNRoleAttester),
+			types.NewMsgID(testingutils.TestingSSVDomainType, testingutils.TestingValidatorPubKey[:], types.BeaconRole(100)),
+			types.NewMsgID(types.DomainType{0x99, 0x99, 0x99, 0x99}, testingutils.TestingValidatorPubKey[:], types.BNRoleAttester),
+			types.NewMsgID(types.DomainType{0x99, 0x99, 0x99, 0x99}, testingutils.TestingValidatorPubKey[:], types.BeaconRole(100)),
+		},
+		BelongsToValidator: true,
+	}
 }
diff --git a/types/spectest/tests/ssvmsg/msg_id_doesnt_belong.go b/types/spectest/tests/ssvmsg/msg_id_doesnt_belong.go
@@ -1,6 +1,20 @@
 package ssvmsg
 
+import (
+	"github.com/bloxapp/ssv-spec/types"
+	"github.com/bloxapp/ssv-spec/types/testingutils"
+)
+
 // MsgIDDoesntBelongs tests msg id doesn't belonging to validator id
-func MsgIDDoesntBelongs() SpecTest {
-	panic("implement")
+func MsgIDDoesntBelongs() *SSVMessageTest {
+	return &SSVMessageTest{
+		Name: "does not belong",
+		MessageIDs: []types.MessageID{
+			types.NewMsgID(testingutils.TestingSSVDomainType, testingutils.TestingWrongValidatorPubKey[:], types.BNRoleAttester),
+			types.NewMsgID(testingutils.TestingSSVDomainType, testingutils.TestingWrongValidatorPubKey[:], types.BeaconRole(100)),
+			types.NewMsgID(types.DomainType{0x99, 0x99, 0x99, 0x99}, testingutils.TestingWrongValidatorPubKey[:], types.BNRoleAttester),
+			types.NewMsgID(types.DomainType{0x99, 0x99, 0x99, 0x99}, testingutils.TestingWrongValidatorPubKey[:], types.BeaconRole(100)),
+		},
+		BelongsToValidator: false,
+	}
 }
diff --git a/types/spectest/tests/ssvmsg/test.go b/types/spectest/tests/ssvmsg/test.go
@@ -2,17 +2,29 @@ package ssvmsg
 
 import (
 	"testing"
+
+	"github.com/bloxapp/ssv-spec/types"
+	"github.com/bloxapp/ssv-spec/types/testingutils"
+	"github.com/stretchr/testify/require"
 )
 
-type SpecTest struct {
-	Name string
-	Data []byte
+type SSVMessageTest struct {
+	Name               string
+	MessageIDs         []types.MessageID
+	BelongsToValidator bool
 }
 
-func (test *SpecTest) TestName() string {
-	return test.Name
+func (test *SSVMessageTest) TestName() string {
+	return "ssvmessage " + test.Name
 }
 
-func (test *SpecTest) Run(t *testing.T) {
-	panic("implement")
+func (test *SSVMessageTest) Run(t *testing.T) {
+
+	ks := testingutils.Testing4SharesSet()
+
+	// For each message ID, test if MessageIDBelongs returns the expected value
+	for _, msgID := range test.MessageIDs {
+		belongs := testingutils.TestingShare(ks).ValidatorPubKey.MessageIDBelongs(msgID)
+		require.Equal(t, test.BelongsToValidator, belongs)
+	}
 }