Sanitize ValidatorIndex conversion

ssv/spectest/tests/committee/singleduty/missing_some_shares.go

@@ -20,7 +20,7 @@ func MissingSomeShares() tests.SpecTest {
 	msgID := testingutils.CommitteeMsgID(ks)
 
 	// Committee's validator indexes
-	committeeShareValidators := []int{1, 3, 5, 7, 9}
+	committeeShareValidators := []phase0.ValidatorIndex{1, 3, 5, 7, 9}
 	// KeySet and Share map for Committee
 	committeeShareKSMap := testingutils.KeySetMapForValidatorIndexList(committeeShareValidators)
 	committeeShareMap := testingutils.ShareMapFromKeySetMap(committeeShareKSMap)

types/testingutils/share_map.go

@@ -17,20 +17,31 @@ func ValidatorIndexList(limit int) []int {
 	return ret
 }
 
-func KeySetMapForValidatorIndexList(valIndexes []int) map[phase0.ValidatorIndex]*TestKeySet {
+func KeySetMapForValidatorIndexList(valIndexes []phase0.ValidatorIndex) map[phase0.ValidatorIndex]*TestKeySet {
 	ret := make(map[phase0.ValidatorIndex]*TestKeySet)
 	for _, valIdx := range valIndexes {
-		ks, exists := TestingKeySetMap[phase0.ValidatorIndex(valIdx)]
+		ks, exists := TestingKeySetMap[valIdx]
 		if !exists {
 			panic(fmt.Sprintf("Validator index %v does not exist in TestingKeySetMap", valIdx))
 		}
-		ret[phase0.ValidatorIndex(valIdx)] = ks
+		ret[valIdx] = ks
 	}
 	return ret
 }
 
 func KeySetMapForValidators(limit int) map[phase0.ValidatorIndex]*TestKeySet {
-	return KeySetMapForValidatorIndexList(ValidatorIndexList(limit))
+	if limit <= 0 {
+		return map[phase0.ValidatorIndex]*TestKeySet{}
+	}
+	validators := make([]phase0.ValidatorIndex, limit)
+	for i := 0; i < limit; i++ {
+		validatorIndex := (i + 1)
+		if validatorIndex < 0 {
+			panic("Invalid validator index")
+		}
+		validators[i] = phase0.ValidatorIndex(validatorIndex)
+	}
+	return KeySetMapForValidatorIndexList(validators)
 }
 
 func ShareMapFromKeySetMap(keySetMap map[phase0.ValidatorIndex]*TestKeySet) map[phase0.ValidatorIndex]*types.Share {