More consensus/types re-export cleanup (#8665)

Remove more of the temporary re-exports from `consensus/types`


Co-Authored-By: Mac L <mjladson@pm.me>

consensus/state_processing/src/per_epoch_processing/altair/participation_flag_updates.rs

@@ -1,8 +1,8 @@
 use crate::EpochProcessingError;
 use milhouse::List;
+use types::attestation::ParticipationFlags;
 use types::beacon_state::BeaconState;
 use types::eth_spec::EthSpec;
-use types::participation_flags::ParticipationFlags;
 
 pub fn process_participation_flag_updates<E: EthSpec>(
     state: &mut BeaconState<E>,

consensus/types/src/block/beacon_block_body.rs

@@ -13,10 +13,11 @@ use test_random_derive::TestRandom;
 use tree_hash::{BYTES_PER_CHUNK, TreeHash};
 use tree_hash_derive::TreeHash;
 
-use crate::payload_attestation::PayloadAttestation;
 use crate::{
     SignedExecutionPayloadBid,
-    attestation::{AttestationBase, AttestationElectra, AttestationRef, AttestationRefMut},
+    attestation::{
+        AttestationBase, AttestationElectra, AttestationRef, AttestationRefMut, PayloadAttestation,
+    },
     core::{EthSpec, Graffiti, Hash256},
     deposit::Deposit,
     execution::{

consensus/types/src/lib.rs

@@ -77,18 +77,10 @@ pub mod graffiti {
     pub use crate::core::GraffitiString;
 }
 
-pub mod indexed_attestation {
-    pub use crate::attestation::{IndexedAttestationBase, IndexedAttestationElectra};
-}
-
 pub mod historical_summary {
     pub use crate::state::HistoricalSummary;
 }
 
-pub mod participation_flags {
-    pub use crate::attestation::ParticipationFlags;
-}
-
 pub mod epoch_cache {
     pub use crate::state::{EpochCache, EpochCacheError, EpochCacheKey};
 }
@@ -97,40 +89,10 @@ pub mod non_zero_usize {
     pub use crate::core::new_non_zero_usize;
 }
 
-pub mod data_column_sidecar {
-    pub use crate::data::{
-        Cell, ColumnIndex, DataColumn, DataColumnSidecar, DataColumnSidecarError,
-        DataColumnSidecarList,
-    };
-}
-
 pub mod builder_bid {
     pub use crate::builder::*;
 }
 
-pub mod blob_sidecar {
-    pub use crate::data::{
-        BlobIdentifier, BlobSidecar, BlobSidecarError, BlobsList, FixedBlobSidecarList,
-    };
-}
-
-pub mod execution_requests {
-    pub use crate::execution::{
-        ConsolidationRequests, DepositRequests, ExecutionRequests, RequestType, WithdrawalRequests,
-    };
-}
-
-pub mod execution_payload_envelope {
-    pub use crate::execution::{ExecutionPayloadEnvelope, SignedExecutionPayloadEnvelope};
-}
-
-pub mod data_column_custody_group {
-    pub use crate::data::{
-        CustodyIndex, compute_columns_for_custody_group, compute_ordered_custody_column_indices,
-        compute_subnets_for_node, compute_subnets_from_custody_group, get_custody_groups,
-    };
-}
-
 pub mod light_client_update {
     pub use crate::light_client::consts::{
         CURRENT_SYNC_COMMITTEE_INDEX, CURRENT_SYNC_COMMITTEE_INDEX_ELECTRA, FINALIZED_ROOT_INDEX,
@@ -144,13 +106,3 @@ pub mod sync_committee_contribution {
         SyncCommitteeContributionError as Error, SyncContributionData,
     };
 }
-
-pub mod signed_aggregate_and_proof {
-    pub use crate::attestation::SignedAggregateAndProofRefMut;
-}
-
-pub mod payload_attestation {
-    pub use crate::attestation::{
-        PayloadAttestation, PayloadAttestationData, PayloadAttestationMessage,
-    };
-}