github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move block and attestation to proto v1alpha1 folder (#9618)

Browse Source 
* Add block and attestation to container pkg

* Move aggregation into attestation

* Update attestation_test.go

* Move them to proto

* Gazelle

* fix cycle

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
This commit is contained in:
terence tsao
2021-09-20 09:17:03 -07:00
committed by GitHub
parent 150640305a
commit 2ba29a3cfc
70 changed files with 189 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon-chain/core/epoch/BUILD.bazel
View File

@@ -16,7 +16,7 @@ go_library(
"//config/features:go_default_library",
"//math:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//shared/attestationutil:go_default_library",
"//proto/prysm/v1alpha1/attestation:go_default_library",
"//shared/params:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",

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

@@ -17,7 +17,7 @@ import (
"github.com/prysmaticlabs/prysm/config/features"
"github.com/prysmaticlabs/prysm/math"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
"github.com/prysmaticlabs/prysm/shared/params"
)
@@ -469,7 +469,7 @@ func UnslashedAttestingIndices(state state.ReadOnlyBeaconState, atts []*ethpb.Pe
if err != nil {
return nil, err
}
attestingIndices, err := attestationutil.AttestingIndices(att.AggregationBits, committee)
attestingIndices, err := attestation.AttestingIndices(att.AggregationBits, committee)
if err != nil {
return nil, err
}

4
beacon-chain/core/epoch/precompute/BUILD.bazel
View File

@@ -22,7 +22,7 @@ go_library(
"//math:go_default_library",
"//monitoring/tracing:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//shared/attestationutil:go_default_library",
"//proto/prysm/v1alpha1/attestation:go_default_library",
"//shared/params:go_default_library",
"@com_github_pkg_errors//:go_default_library",
"@com_github_prysmaticlabs_eth2_types//:go_default_library",
@@ -48,7 +48,7 @@ go_test(
"//beacon-chain/state/v1:go_default_library",
"//math:go_default_library",
"//proto/prysm/v1alpha1:go_default_library",
"//shared/attestationutil:go_default_library",
"//proto/prysm/v1alpha1/attestation:go_default_library",
"//shared/params:go_default_library",
"//shared/testutil:go_default_library",
"//shared/testutil/assert:go_default_library",

4
beacon-chain/core/epoch/precompute/attestation.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/state"
"github.com/prysmaticlabs/prysm/monitoring/tracing"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
"github.com/prysmaticlabs/prysm/shared/params"
"go.opencensus.io/trace"
)
@@ -57,7 +57,7 @@ func ProcessAttestations(
if err != nil {
return nil, nil, err
}
indices, err := attestationutil.AttestingIndices(a.AggregationBits, committee)
indices, err := attestation.AttestingIndices(a.AggregationBits, committee)
if err != nil {
return nil, nil, err
}

6
beacon-chain/core/epoch/precompute/attestation_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
"github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/attestation"
"github.com/prysmaticlabs/prysm/shared/params"
"github.com/prysmaticlabs/prysm/shared/testutil"
"github.com/prysmaticlabs/prysm/shared/testutil/assert"
@@ -183,7 +183,7 @@ func TestProcessAttestations(t *testing.T) {
committee, err := helpers.BeaconCommitteeFromState(beaconState, att1.Data.Slot, att1.Data.CommitteeIndex)
require.NoError(t, err)
indices, err := attestationutil.AttestingIndices(att1.AggregationBits, committee)
indices, err := attestation.AttestingIndices(att1.AggregationBits, committee)
require.NoError(t, err)
for _, i := range indices {
if !pVals[i].IsPrevEpochAttester {
@@ -192,7 +192,7 @@ func TestProcessAttestations(t *testing.T) {
}
committee, err = helpers.BeaconCommitteeFromState(beaconState, att2.Data.Slot, att2.Data.CommitteeIndex)
require.NoError(t, err)
indices, err = attestationutil.AttestingIndices(att2.AggregationBits, committee)
indices, err = attestation.AttestingIndices(att2.AggregationBits, committee)
require.NoError(t, err)
for _, i := range indices {
assert.Equal(t, true, pVals[i].IsPrevEpochAttester, "Not a prev epoch attester")