Cleanup single attestation imports

beacon_node/beacon_chain/src/attestation_verification.rs

@@ -60,7 +60,7 @@ use std::borrow::Cow;
 use strum::AsRefStr;
 use tree_hash::TreeHash;
 use types::{
-    attestation::SingleAttestation, Attestation, AttestationRef, BeaconCommittee,
+    SingleAttestation, Attestation, AttestationRef, BeaconCommittee,
     BeaconStateError::NoCommitteeFound, ChainSpec, CommitteeIndex, Epoch, EthSpec, Hash256,
     IndexedAttestation, SelectionProof, SignedAggregateAndProof, Slot, SubnetId,
 };

beacon_node/beacon_chain/src/test_utils.rs

@@ -16,7 +16,6 @@ use crate::{
     BeaconChain, BeaconChainTypes, BlockError, ChainConfig, ServerSentEventHandler,
     StateSkipConfig,
 };
-use attestation::SingleAttestation;
 use bls::get_withdrawal_credentials;
 use eth2::types::SignedBlockContentsTuple;
 use execution_layer::test_utils::generate_genesis_header;

beacon_node/http_api/src/lib.rs

@@ -81,7 +81,7 @@ use tokio_stream::{
     StreamExt,
 };
 use types::{
-    attestation::SingleAttestation, fork_versioned_response::EmptyMetadata, Attestation,
+    SingleAttestation, fork_versioned_response::EmptyMetadata, Attestation,
     AttestationData, AttestationShufflingId, AttesterSlashing, BeaconStateError, CommitteeCache,
     ConfigAndPreset, Epoch, EthSpec, ForkName, ForkVersionedResponse, Hash256,
     ProposerPreparationData, ProposerSlashing, RelativeEpoch, SignedAggregateAndProof,

beacon_node/http_api/src/publish_attestations.rs

@@ -50,7 +50,7 @@ use tokio::sync::{
     mpsc::{Sender, UnboundedSender},
     oneshot,
 };
-use types::{attestation::SingleAttestation, Attestation, EthSpec};
+use types::{SingleAttestation, Attestation, EthSpec};
 
 // Error variants are only used in `Debug` and considered `dead_code` by the compiler.
 #[derive(Debug)]

beacon_node/http_api/tests/tests.rs

@@ -39,7 +39,7 @@ use tokio::time::Duration;
 use tree_hash::TreeHash;
 use types::application_domain::ApplicationDomain;
 use types::{
-    attestation::AttestationBase, attestation::SingleAttestation, AggregateSignature, BitList,
+    attestation::AttestationBase, SingleAttestation, AggregateSignature, BitList,
     Domain, EthSpec, ExecutionBlockHash, Hash256, Keypair, MainnetEthSpec, RelativeEpoch,
     SelectionProof, SignedRoot, Slot,
 };

beacon_node/lighthouse_network/src/types/pubsub.rs

@@ -6,7 +6,7 @@ use snap::raw::{decompress_len, Decoder, Encoder};
 use ssz::{Decode, Encode};
 use std::io::{Error, ErrorKind};
 use std::sync::Arc;
-use types::attestation::SingleAttestation;
+use types::SingleAttestation;
 use types::{
     Attestation, AttestationBase, AttestationElectra, AttesterSlashing, AttesterSlashingBase,
     AttesterSlashingElectra, BlobSidecar, DataColumnSidecar, DataColumnSubnetId, EthSpec,

beacon_node/network/src/network_beacon_processor/mod.rs

@@ -1,7 +1,6 @@
 use crate::sync::manager::BlockProcessType;
 use crate::sync::SamplingId;
 use crate::{service::NetworkMessage, sync::manager::SyncMessage};
-use attestation::SingleAttestation;
 use beacon_chain::blob_verification::{GossipBlobError, GossipVerifiedBlob};
 use beacon_chain::block_verification_types::RpcBlock;
 use beacon_chain::data_column_verification::{observe_gossip_data_column, GossipDataColumnError};

common/eth2/src/lib.rs

@@ -36,7 +36,7 @@ use std::future::Future;
 use std::path::PathBuf;
 use std::time::Duration;
 use store::fork_versioned_response::ExecutionOptimisticFinalizedForkVersionedResponse;
-use types::attestation::SingleAttestation;
+use types::SingleAttestation;
 
 pub const V1: EndpointVersion = EndpointVersion(1);
 pub const V2: EndpointVersion = EndpointVersion(2);

common/eth2/src/types.rs

@@ -5,7 +5,6 @@ use crate::{
     Error as ServerError, CONSENSUS_BLOCK_VALUE_HEADER, CONSENSUS_VERSION_HEADER,
     EXECUTION_PAYLOAD_BLINDED_HEADER, EXECUTION_PAYLOAD_VALUE_HEADER,
 };
-use attestation::SingleAttestation;
 use lighthouse_network::{ConnectionDirection, Enr, Multiaddr, PeerConnectionStatus};
 use mediatype::{names, MediaType, MediaTypeList};
 use reqwest::header::HeaderMap;

consensus/types/src/lib.rs

@@ -116,7 +116,7 @@ pub use crate::aggregate_and_proof::{
 };
 pub use crate::attestation::{
     Attestation, AttestationBase, AttestationElectra, AttestationRef, AttestationRefMut,
-    Error as AttestationError,
+    Error as AttestationError, SingleAttestation
 };
 pub use crate::attestation_data::AttestationData;
 pub use crate::attestation_duty::AttestationDuty;

consensus/types/src/subnet_id.rs

@@ -1,5 +1,5 @@
 //! Identifies each shard by an integer identifier.
-use crate::attestation::SingleAttestation;
+use crate::SingleAttestation;
 use crate::{AttestationRef, ChainSpec, CommitteeIndex, EthSpec, Slot};
 use alloy_primitives::{bytes::Buf, U256};
 use safe_arith::{ArithError, SafeArith};