mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-24 20:37:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed attesting indices set (#3469)

Browse Source 
* Fixed attesting indices set

* Typo

* Regression test

* Comment

* Validator count for tests
This commit is contained in:
terence tsao 2019-09-15 13:54:55 -07:00 committed by Preston Van Loon
parent a2685245f2
commit c5b4cf7f7d
2 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon-chain/core/epoch/epoch_processing.go
View File

@ -570,13 +570,14 @@ func unslashedAttestingIndices(state *pb.BeaconState, atts []*pb.PendingAttestat
return nil, errors.Wrap(err, "could not get attester indices")
}
// Create a set for attesting indices
for i, index := range attestingIndices {
if seen[index] { // Remove duplicate
attestingIndices = append(attestingIndices[:i], attestingIndices[i+1:]...)
set := make([]uint64, 0, len(attestingIndices))
for _, index := range attestingIndices {
if !seen[index] {
set = append(set, index)
}
seen[index] = true
}
setIndices = append(setIndices, attestingIndices...)
setIndices = append(setIndices, set...)
}
// Sort the attesting set indices by increasing order.
sort.Slice(setIndices, func(i, j int) bool { return setIndices[i] < setIndices[j] })

49
beacon-chain/core/epoch/epoch_processing_test.go
View File

@ -35,19 +35,19 @@ func TestUnslashedAttestingIndices_CanSortAndFilter(t *testing.T) {
Shard: uint64(i),
},
},
AggregationBits: bitfield.Bitlist{0xC0, 0xC0, 0x01},
AggregationBits: bitfield.Bitlist{0xFF, 0xFF, 0xFF},
}
}
// Generate validators and state for the 2 attestations.
validators := make([]*ethpb.Validator, params.BeaconConfig().MinGenesisActiveValidatorCount/16)
validatorCount := 1000
validators := make([]*ethpb.Validator, validatorCount)
for i := 0; i < len(validators); i++ {
validators[i] = &ethpb.Validator{
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state := &pb.BeaconState{
Slot: 0,
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
ActiveIndexRoots: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
@ -58,8 +58,8 @@ func TestUnslashedAttestingIndices_CanSortAndFilter(t *testing.T) {
t.Fatal(err)
}
for i := 0; i < len(indices)-1; i++ {
if indices[i] > indices[i+1] {
t.Error("sorted indices not sorted")
if indices[i] >= indices[i+1] {
t.Error("sorted indices not sorted or duplicated")
}
}
@ -77,6 +77,45 @@ func TestUnslashedAttestingIndices_CanSortAndFilter(t *testing.T) {
}
}
func TestUnslashedAttestingIndices_DuplicatedAttestations(t *testing.T) {
// Generate 5 of the same attestations.
atts := make([]*pb.PendingAttestation, 5)
for i := 0; i < len(atts); i++ {
atts[i] = &pb.PendingAttestation{
Data: &ethpb.AttestationData{Source: &ethpb.Checkpoint{},
Target: &ethpb.Checkpoint{Epoch: 0},
Crosslink: &ethpb.Crosslink{},
},
AggregationBits: bitfield.Bitlist{0xFF, 0xFF, 0xFF},
}
}
// Generate validators and state for the 5 attestations.
validatorCount := 1000
validators := make([]*ethpb.Validator, validatorCount)
for i := 0; i < len(validators); i++ {
validators[i] = &ethpb.Validator{
ExitEpoch: params.BeaconConfig().FarFutureEpoch,
}
}
state := &pb.BeaconState{
Validators: validators,
RandaoMixes: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
ActiveIndexRoots: make([][]byte, params.BeaconConfig().EpochsPerHistoricalVector),
}
indices, err := unslashedAttestingIndices(state, atts)
if err != nil {
t.Fatal(err)
}
for i := 0; i < len(indices)-1; i++ {
if indices[i] >= indices[i+1] {
t.Error("sorted indices not sorted or duplicated")
}
}
}
func TestAttestingBalance_CorrectBalance(t *testing.T) {
helpers.ClearAllCaches()