From 07229b76ed89dadd6ce7464699ed5f9a265e8851 Mon Sep 17 00:00:00 2001
From: realbigsean <sean@sigmaprime.io>
Date: Thu, 9 May 2024 13:40:52 -0400
Subject: [PATCH] Ef test fixes (#5753)

* attestation related ef test fixes

* delete commented out stuff
---
 testing/ef_tests/src/type_name.rs |  7 ++---
 testing/ef_tests/tests/tests.rs   | 49 +++++++++++++++++++------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/testing/ef_tests/src/type_name.rs b/testing/ef_tests/src/type_name.rs
index 30db5c0e4a..cbea78dabf 100644
--- a/testing/ef_tests/src/type_name.rs
+++ b/testing/ef_tests/src/type_name.rs
@@ -111,11 +111,8 @@ type_name_generic!(LightClientUpdateDeneb, "LightClientUpdate");
 type_name_generic!(PendingAttestation);
 type_name!(ProposerSlashing);
 type_name_generic!(SignedAggregateAndProof);
-type_name_generic!(SignedAggregateAndProofBase, "SignedAggregateAndProofBase");
-type_name_generic!(
-    SignedAggregateAndProofElectra,
-    "SignedAggregateAndProofElectra"
-);
+type_name_generic!(SignedAggregateAndProofBase, "SignedAggregateAndProof");
+type_name_generic!(SignedAggregateAndProofElectra, "SignedAggregateAndProof");
 type_name_generic!(SignedBeaconBlock);
 type_name!(SignedBeaconBlockHeader);
 type_name_generic!(SignedContributionAndProof);
diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs
index 85d9362aae..fb8bdfcae7 100644
--- a/testing/ef_tests/tests/tests.rs
+++ b/testing/ef_tests/tests/tests.rs
@@ -219,7 +219,6 @@ mod ssz_static {
     use types::historical_summary::HistoricalSummary;
     use types::{AttesterSlashingBase, AttesterSlashingElectra, LightClientBootstrapAltair, *};
 
-    ssz_static_test!(aggregate_and_proof, AggregateAndProof<_>);
     ssz_static_test!(attestation, Attestation<_>);
     ssz_static_test!(attestation_data, AttestationData);
     ssz_static_test!(beacon_block, SszStaticWithSpecHandler, BeaconBlock<_>);
@@ -249,7 +248,7 @@ mod ssz_static {
     ssz_static_test!(voluntary_exit, VoluntaryExit);
 
     #[test]
-    fn signed_aggregate_and_proof() {
+    fn attester_slashing() {
         SszStaticHandler::<AttesterSlashingBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra()
             .run();
         SszStaticHandler::<AttesterSlashingBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra()
@@ -260,6 +259,36 @@ mod ssz_static {
             .run();
     }
 
+    #[test]
+    fn signed_aggregate_and_proof() {
+        SszStaticHandler::<SignedAggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra(
+        )
+        .run();
+        SszStaticHandler::<SignedAggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra(
+        )
+        .run();
+        SszStaticHandler::<SignedAggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
+        )
+        .run();
+        SszStaticHandler::<SignedAggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
+        )
+        .run();
+    }
+
+    #[test]
+    fn aggregate_and_proof() {
+        SszStaticHandler::<AggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra()
+            .run();
+        SszStaticHandler::<AggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra()
+            .run();
+        SszStaticHandler::<AggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
+        )
+        .run();
+        SszStaticHandler::<AggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
+        )
+        .run();
+    }
+
     // BeaconBlockBody has no internal indicator of which fork it is for, so we test it separately.
     #[test]
     fn beacon_block_body() {
@@ -283,22 +312,6 @@ mod ssz_static {
             .run();
     }
 
-    #[test]
-    fn signed_aggregate_and_proof() {
-        SszStaticHandler::<SignedAggregateAndProofBase<MinimalEthSpec>, MinimalEthSpec>::pre_electra(
-        )
-        .run();
-        SszStaticHandler::<SignedAggregateAndProofBase<MainnetEthSpec>, MainnetEthSpec>::pre_electra(
-        )
-        .run();
-        SszStaticHandler::<SignedAggregateAndProofElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
-        )
-        .run();
-        SszStaticHandler::<SignedAggregateAndProofElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only(
-        )
-        .run();
-    }
-
     // Altair and later
     #[test]
     fn contribution_and_proof() {