merge with capella

testing/ef_tests/src/cases/merkle_proof_validity.rs

@@ -29,7 +29,7 @@ pub struct MerkleProofValidity<E: EthSpec> {
 impl<E: EthSpec> LoadCase for MerkleProofValidity<E> {
     fn load_from_dir(path: &Path, fork_name: ForkName) -> Result<Self, Error> {
         let spec = &testing_spec::<E>(fork_name);
-        let state = ssz_decode_state(&path.join("state.ssz_snappy"), spec)?;
+        let state = ssz_decode_state(&path.join("object.ssz_snappy"), spec)?;
         let merkle_proof = yaml_decode_file(&path.join("proof.yaml"))?;
         // Metadata does not exist in these tests but it is left like this just in case.
         let meta_path = path.join("meta.yaml");

testing/ef_tests/src/cases/operations.rs

@@ -20,8 +20,6 @@ use state_processing::{
     ConsensusContext,
 };
 use std::fmt::Debug;
-#[cfg(not(all(feature = "withdrawals", feature = "withdrawals-processing")))]
-use std::marker::PhantomData;
 use std::path::Path;
 #[cfg(feature = "withdrawals")]
 use types::SignedBlsToExecutionChange;
@@ -43,6 +41,7 @@ struct ExecutionMetadata {
 }
 
 /// Newtype for testing withdrawals.
+#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
 #[derive(Debug, Clone, Deserialize)]
 pub struct WithdrawalsPayload<T: EthSpec> {
     payload: FullPayload<T>,

testing/ef_tests/src/lib.rs

@@ -1,9 +1,11 @@
 pub use case_result::CaseResult;
+#[cfg(all(feature = "withdrawals", feature = "withdrawals-processing"))]
+pub use cases::WithdrawalsPayload;
 pub use cases::{
     Case, EffectiveBalanceUpdates, Eth1DataReset, HistoricalRootsUpdate, InactivityUpdates,
     JustificationAndFinalization, ParticipationFlagUpdates, ParticipationRecordUpdates,
     RandaoMixesReset, RegistryUpdates, RewardsAndPenalties, Slashings, SlashingsReset,
-    SyncCommitteeUpdates, WithdrawalsPayload,
+    SyncCommitteeUpdates,
 };
 pub use decode::log_file_access;
 pub use error::Error;