Electra: Forkchoice spectest fix (#14180)

prysmaticlabs · Jul 12, 2024 · 3eacc37 · 3eacc37
1 parent 5267b4b
commit 3eacc37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/testing/spectest/shared/common/forkchoice/builder.go b/testing/spectest/shared/common/forkchoice/builder.go
@@ -120,7 +120,7 @@ func (bb *Builder) PoWBlock(pb *ethpb.PowBlock) {
 }
 
 // Attestation receives the attestation and updates forkchoice.
-func (bb *Builder) Attestation(t testing.TB, a *ethpb.Attestation) {
+func (bb *Builder) Attestation(t testing.TB, a ethpb.Att) {
  require.NoError(t, bb.service.OnAttestation(context.TODO(), a, params.BeaconConfig().MaximumGossipClockDisparityDuration()))
 }
 

diff --git a/testing/spectest/shared/common/forkchoice/runner.go b/testing/spectest/shared/common/forkchoice/runner.go
@@ -37,7 +37,7 @@ func Run(t *testing.T, config string, fork int) {
  }
 }
 
-func runTest(t *testing.T, config string, fork int, basePath string) {
+func runTest(t *testing.T, config string, fork int, basePath string) { // nolint:gocognit
  require.NoError(t, utils.SetConfig(t, config))
  testFolders, _ := utils.TestFolders(t, config, version.String(fork), basePath)
  if len(testFolders) == 0 {
@@ -144,7 +144,12 @@ func runTest(t *testing.T, config string, fork int, basePath string) {
  require.NoError(t, err)
  attSSZ, err := snappy.Decode(nil /* dst */, attFile)
  require.NoError(t, err)
- att := &ethpb.Attestation{}
+ var att ethpb.Att
+ if fork < version.Electra {
+ att = &ethpb.Attestation{}
+ } else {
+ att = &ethpb.AttestationElectra{}
+ }
  require.NoError(t, att.UnmarshalSSZ(attSSZ), "Failed to unmarshal")
  builder.Attestation(t, att)
  }