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>

beacon_node/lighthouse_network/src/discovery/subnet_predicate.rs

@@ -4,7 +4,7 @@ use crate::types::{EnrAttestationBitfield, EnrSyncCommitteeBitfield};
 use std::ops::Deref;
 use tracing::trace;
 use types::ChainSpec;
-use types::data_column_custody_group::compute_subnets_for_node;
+use types::data::compute_subnets_for_node;
 
 /// Returns the predicate for a given subnet.
 pub fn subnet_predicate<E>(

beacon_node/lighthouse_network/src/peer_manager/mod.rs

@@ -33,9 +33,7 @@ pub use peerdb::sync_status::{SyncInfo, SyncStatus};
 use std::collections::{HashMap, HashSet, hash_map::Entry};
 use std::net::IpAddr;
 use strum::IntoEnumIterator;
-use types::data_column_custody_group::{
-    CustodyIndex, compute_subnets_from_custody_group, get_custody_groups,
-};
+use types::data::{CustodyIndex, compute_subnets_from_custody_group, get_custody_groups};
 
 /// Unified peer subnet information structure for pruning logic.
 struct PeerSubnetInfo<E: EthSpec> {

beacon_node/lighthouse_network/src/peer_manager/peerdb.rs

@@ -15,7 +15,7 @@ use std::{
 };
 use sync_status::SyncStatus;
 use tracing::{debug, error, trace, warn};
-use types::data_column_custody_group::compute_subnets_for_node;
+use types::data::compute_subnets_for_node;
 use types::{ChainSpec, DataColumnSubnetId, Epoch, EthSpec, Hash256, Slot};
 
 pub mod client;

beacon_node/lighthouse_network/src/rpc/codec.rs

@@ -913,7 +913,8 @@ mod tests {
     use types::{
         BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockBellatrix, BeaconBlockHeader,
         DataColumnsByRootIdentifier, EmptyBlock, Epoch, FullPayload, KzgCommitment, KzgProof,
-        SignedBeaconBlockHeader, Slot, blob_sidecar::BlobIdentifier, data_column_sidecar::Cell,
+        SignedBeaconBlockHeader, Slot,
+        data::{BlobIdentifier, Cell},
     };
 
     type Spec = types::MainnetEthSpec;

beacon_node/lighthouse_network/src/rpc/methods.rs

@@ -12,13 +12,12 @@ use std::ops::Deref;
 use std::sync::Arc;
 use strum::IntoStaticStr;
 use superstruct::superstruct;
-use types::blob_sidecar::BlobIdentifier;
+use types::data::BlobIdentifier;
 use types::light_client_update::MAX_REQUEST_LIGHT_CLIENT_UPDATES;
 use types::{
     ChainSpec, ColumnIndex, DataColumnSidecar, DataColumnsByRootIdentifier, Epoch, EthSpec,
     ForkContext, Hash256, LightClientBootstrap, LightClientFinalityUpdate,
-    LightClientOptimisticUpdate, LightClientUpdate, SignedBeaconBlock, Slot,
-    blob_sidecar::BlobSidecar,
+    LightClientOptimisticUpdate, LightClientUpdate, SignedBeaconBlock, Slot, data::BlobSidecar,
 };
 
 /// Maximum length of error message.

beacon_node/lighthouse_network/src/types/globals.rs

@@ -10,7 +10,7 @@ use parking_lot::RwLock;
 use std::collections::HashSet;
 use std::sync::Arc;
 use tracing::{debug, error};
-use types::data_column_custody_group::{compute_subnets_from_custody_group, get_custody_groups};
+use types::data::{compute_subnets_from_custody_group, get_custody_groups};
 use types::{ChainSpec, ColumnIndex, DataColumnSubnetId, EthSpec};
 
 pub struct NetworkGlobals<E: EthSpec> {