From 3eacc378312fc251f2cf7d9b354e31bbc8b3b658 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Fri, 12 Jul 2024 11:50:29 -0500 Subject: [PATCH] Electra: Forkchoice spectest fix (#14180) --- testing/spectest/shared/common/forkchoice/builder.go | 2 +- testing/spectest/shared/common/forkchoice/runner.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testing/spectest/shared/common/forkchoice/builder.go b/testing/spectest/shared/common/forkchoice/builder.go index 81421dc8875d..ac07073d6fd0 100644 --- 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 index 4f4784446f6c..c999888c80db 100644 --- 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 := ðpb.Attestation{} + var att ethpb.Att + if fork < version.Electra { + att = ðpb.Attestation{} + } else { + att = ðpb.AttestationElectra{} + } require.NoError(t, att.UnmarshalSSZ(attSSZ), "Failed to unmarshal") builder.Attestation(t, att) }