Skip to content

Commit 3d6c3ac

Browse files
Tests - Fix test entropy (#523)
* fix: loop sorted validator indexes * generate JSON tests * use generic sorting function
1 parent 3a9cb8e commit 3d6c3ac

12 files changed

+1870
-1852
lines changed

ssv/spectest/generate/tests/committee.MultiCommitteeSpecTest_decided.json

Lines changed: 452 additions & 452 deletions
Large diffs are not rendered by default.

ssv/spectest/generate/tests/committee.MultiCommitteeSpecTest_happy_flow.json

Lines changed: 1025 additions & 1025 deletions
Large diffs are not rendered by default.

ssv/spectest/generate/tests/committee.MultiCommitteeSpecTest_start_committee_duty_with_missing_shares.json

Lines changed: 81 additions & 81 deletions
Large diffs are not rendered by default.

ssv/spectest/generate/tests/tests.MultiMsgProcessingSpecTest_post_consensus_partial_invalid_root_quorum_then_valid_quorum.json

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

ssv/spectest/generate/tests/tests.MultiMsgProcessingSpecTest_post_consensus_partial_invalid_sig_quorum_then_valid_quorum.json

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

ssv/spectest/generate/tests/valcheck.SpecTest_attestation_value_check_with_slashable_minority.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"DutySlot": "12",
66
"Input": "AQIDBAUGBwgJCgECAwQFBgcICQoBAgMEBQYHCAkKAQIAAAAAAAAAAAECAwQFBgcICQoBAgMEBQYHCAkKAQIDBAUGBwgJCgECAQAAAAAAAAABAgMEBQYHCAkKAQIDBAUGBwgJCgECAwQFBgcICQoBAg==",
77
"SlashableSlots": {
8-
"42409cb09fa945fa6a168cf8b0861045d6e562f211a70c4a1cdbcf0417898763": [
8+
"5f4711a796c1116b5118ec35279fb64d551d9b38813d2939954dd2df5160d3d9": [
99
"12"
1010
]
1111
},
1212
"omitempty": [
13-
"QkCcsJ+pRfpqFoz4sIYQRdblYvIRpwxKHNvPBBeJh2M=",
1413
"X0cRp5bBEWtRGOw1J5+2TVUdmziBPSk5lU3S31Fg09k=",
1514
"SOTAo46Q+TUtHQlIlEZEPr0XsZBPTwAC/olMLD9iRXo=",
16-
"Zdx8F59oNHzxL4bhxR5U6K7u1XnUxxUIK7igOCwagVM="
15+
"Zdx8F59oNHzxL4bhxR5U6K7u1XnUxxUIK7igOCwagVM=",
16+
"QkCcsJ+pRfpqFoz4sIYQRdblYvIRpwxKHNvPBBeJh2M="
1717
],
1818
"ExpectedError": "slashable attestation",
1919
"AnyError": false

ssv/spectest/tests/valcheck/valcheckattestations/majority_slashable.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func MajoritySlashable() tests.SpecTest {
3131
keySet := testingutils.Testing4SharesSet()
3232
sharesPKBytes := make([]types.ShareValidatorPK, 0)
3333
sharesPKString := make([]string, 0)
34-
for _, shareKey := range keySet.Shares {
35-
shareBytes := shareKey.Serialize()
34+
for _, opShare := range testingutils.SortedMapKeys(keySet.Shares) {
35+
shareBytes := opShare.Value.Serialize()
3636
sharesPKBytes = append(sharesPKBytes, shareBytes)
3737
sharesPKString = append(sharesPKString, hex.EncodeToString(shareBytes))
3838
}

ssv/spectest/tests/valcheck/valcheckattestations/minority_slashable.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func MinoritySlashable() tests.SpecTest {
3131
keySet := testingutils.Testing4SharesSet()
3232
sharesPKBytes := make([]types.ShareValidatorPK, 0)
3333
sharesPKString := make([]string, 0)
34-
for _, shareKey := range keySet.Shares {
35-
shareBytes := shareKey.Serialize()
34+
for _, opShare := range testingutils.SortedMapKeys(keySet.Shares) {
35+
shareBytes := opShare.Value.Serialize()
3636
sharesPKBytes = append(sharesPKBytes, shareBytes)
3737
sharesPKString = append(sharesPKString, hex.EncodeToString(shareBytes))
3838
}

types/testingutils/beacon_node_attestation.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,8 @@ var TestingAttestationResponseBeaconObjectForDuty = func(ks *TestKeySet, version
425425

426426
var TestingSignedAttestationSSZRootForKeyMap = func(ksMap map[phase0.ValidatorIndex]*TestKeySet) []string {
427427
ret := make([]string, 0)
428-
for _, ks := range ksMap {
428+
for _, valKs := range SortedMapKeys(ksMap) {
429+
ks := valKs.Value
429430
duty := TestingAttesterDuty(spec.DataVersionPhase0).ValidatorDuties[0]
430431
aggregationBitfield := bitfield.NewBitlist(duty.CommitteeLength)
431432
aggregationBitfield.SetBitAt(duty.ValidatorCommitteeIndex, true)
@@ -440,8 +441,9 @@ var TestingSignedAttestationSSZRootForKeyMap = func(ksMap map[phase0.ValidatorIn
440441

441442
var TestingElectraAttestationSSZRootForKeyMap = func(ksMap map[phase0.ValidatorIndex]*TestKeySet) []string {
442443
ret := make([]string, 0)
443-
for valIdx, ks := range ksMap {
444-
444+
for _, valKs := range SortedMapKeys(ksMap) {
445+
ks := valKs.Value
446+
valIdx := valKs.Key
445447
committeeDuty := TestingAttesterDutyForValidator(spec.DataVersionElectra, valIdx)
446448
duty := committeeDuty.ValidatorDuties[0]
447449

@@ -467,8 +469,10 @@ var TestingElectraAttestationSSZRootForKeyMap = func(ksMap map[phase0.ValidatorI
467469

468470
var TestingElectraSingleAttestationSSZRootForKeyMap = func(ksMap map[phase0.ValidatorIndex]*TestKeySet) []string {
469471
ret := make([]string, 0)
470-
for valIdx, ks := range ksMap {
471472

473+
for _, valKs := range SortedMapKeys(ksMap) {
474+
ks := valKs.Value
475+
valIdx := valKs.Key
472476
committeeDuty := TestingAttesterDutyForValidator(spec.DataVersionElectra, valIdx)
473477
duty := committeeDuty.ValidatorDuties[0]
474478

types/testingutils/beacon_node_sync_committee.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ var TestingSignedSyncCommitteeBlockRootForValidatorIndex = func(ks *TestKeySet,
3838

3939
var TestingSignedSyncCommitteeBlockRootSSZRootForKeyMap = func(ksMap map[phase0.ValidatorIndex]*TestKeySet, version spec.DataVersion) []string {
4040
ret := make([]string, 0)
41-
for valIdx, ks := range ksMap {
41+
for _, valKs := range SortedMapKeys(ksMap) {
42+
ks := valKs.Value
43+
valIdx := valKs.Key
4244
ret = append(ret, GetSSZRootNoError(&altair.SyncCommitteeMessage{
4345
Slot: TestingDutySlotV(version),
4446
BeaconBlockRoot: TestingBlockRoot,

0 commit comments

Comments
 (0)