paritytech · olanod · Nov 6, 2023
diff --git a/cumulus/client/collator/Cargo.toml b/cumulus/client/collator/Cargo.toml
@@ -29,7 +29,6 @@ cumulus-client-network = { path = "../network" }
 cumulus-primitives-core = { path = "../../primitives/core" }
 
 [dev-dependencies]
-async-trait = "0.1.73"
 
 # Substrate
 sp-maybe-compressed-blob = { path = "../../../substrate/primitives/maybe-compressed-blob" }

diff --git a/cumulus/client/collator/src/lib.rs b/cumulus/client/collator/src/lib.rs
@@ -333,7 +333,6 @@ pub fn start_collator_sync<Block, RA, BS, Spawner>(
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use async_trait::async_trait;
 	use cumulus_client_consensus_common::ParachainCandidate;
 	use cumulus_primitives_core::ParachainBlockData;
 	use cumulus_test_client::{
@@ -355,7 +354,6 @@ mod tests {
 
 	struct AlwaysSupportsParachains;
 
-	#[async_trait]
 	impl HeadSupportsParachains for AlwaysSupportsParachains {
 		async fn head_supports_parachains(&self, _head: &PHash) -> bool {
 			true
@@ -367,7 +365,6 @@ mod tests {
 		client: Arc<Client>,
 	}
 
-	#[async_trait::async_trait]
 	impl ParachainConsensus<Block> for DummyParachainConsensus {
 		async fn produce_candidate(
 			&mut self,

diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
@@ -6,7 +6,6 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-async-trait = "0.1.73"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
 futures = "0.3.28"
 tracing = "0.1.37"

diff --git a/cumulus/client/consensus/aura/src/equivocation_import_queue.rs b/cumulus/client/consensus/aura/src/equivocation_import_queue.rs
@@ -76,7 +76,6 @@ struct Verifier<P, Client, Block, CIDP> {
 	_phantom: std::marker::PhantomData<fn() -> (Block, P)>,
 }
 
-#[async_trait::async_trait]
 impl<P, Client, Block, CIDP> VerifierT<Block> for Verifier<P, Client, Block, CIDP>
 where
 	P: Pair,

diff --git a/cumulus/client/consensus/aura/src/lib.rs b/cumulus/client/consensus/aura/src/lib.rs
@@ -191,7 +191,6 @@ where
 	}
 }
 
-#[async_trait::async_trait]
 impl<B, CIDP, W> ParachainConsensus<B> for AuraConsensus<B, CIDP, W>
 where
 	B: BlockT,

diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
@@ -6,7 +6,6 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-async-trait = "0.1.73"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
 dyn-clone = "1.0.12"
 futures = "0.3.28"

diff --git a/cumulus/client/consensus/common/src/import_queue.rs b/cumulus/client/consensus/common/src/import_queue.rs
@@ -47,7 +47,6 @@ use crate::ParachainBlockImportMarker;
 /// This should only be used when the runtime is responsible for checking block seals and inherents.
 pub struct VerifyNothing;
 
-#[async_trait::async_trait]
 impl<Block: BlockT> Verifier<Block> for VerifyNothing {
 	async fn verify(
 		&mut self,

diff --git a/cumulus/client/consensus/common/src/lib.rs b/cumulus/client/consensus/common/src/lib.rs
@@ -77,7 +77,6 @@ pub struct ParachainCandidate<B> {
 /// decide if this specific collator should build a candidate for the given relay chain block. The
 /// consensus implementation could, for example, check whether this specific collator is part of a
 /// staked set.
-#[async_trait::async_trait]
 pub trait ParachainConsensus<B: BlockT>: Send + Sync + dyn_clone::DynClone {
 	/// Produce a new candidate at the given parent block and relay-parent blocks.
 	///
@@ -97,7 +96,6 @@ pub trait ParachainConsensus<B: BlockT>: Send + Sync + dyn_clone::DynClone {
 
 dyn_clone::clone_trait_object!(<B> ParachainConsensus<B> where B: BlockT);
 
-#[async_trait::async_trait]
 impl<B: BlockT> ParachainConsensus<B> for Box<dyn ParachainConsensus<B> + Send + Sync> {
 	async fn produce_candidate(
 		&mut self,
@@ -151,7 +149,6 @@ impl<Block: BlockT, I: Clone, BE> Clone for ParachainBlockImport<Block, I, BE> {
 	}
 }
 
-#[async_trait::async_trait]
 impl<Block, BI, BE> BlockImport<Block> for ParachainBlockImport<Block, BI, BE>
 where
 	Block: BlockT,

diff --git a/cumulus/client/consensus/common/src/tests.rs b/cumulus/client/consensus/common/src/tests.rs
@@ -16,7 +16,6 @@
 
 use crate::*;
 
-use async_trait::async_trait;
 use codec::Encode;
 use cumulus_client_pov_recovery::RecoveryKind;
 use cumulus_primitives_core::{
@@ -89,7 +88,6 @@ impl Relaychain {
 	}
 }
 
-#[async_trait]
 impl RelayChainInterface for Relaychain {
 	async fn validators(&self, _: PHash) -> RelayChainResult<Vec<ValidatorId>> {
 		unimplemented!("Not needed for test")

diff --git a/cumulus/client/consensus/proposer/Cargo.toml b/cumulus/client/consensus/proposer/Cargo.toml
@@ -7,7 +7,6 @@ edition.workspace = true
 
 [dependencies]
 anyhow = "1.0"
-async-trait = "0.1.73"
 thiserror = "1.0.48"
 
 # Substrate

diff --git a/cumulus/client/consensus/proposer/src/lib.rs b/cumulus/client/consensus/proposer/src/lib.rs
@@ -19,8 +19,6 @@
 //!
 //! This utility is designed to be composed within any collator consensus algorithm.
 
-use async_trait::async_trait;
-
 use cumulus_primitives_parachain_inherent::ParachainInherentData;
 use sp_consensus::{EnableProofRecording, Environment, Proposal, Proposer as SubstrateProposer};
 use sp_inherents::InherentData;
@@ -53,7 +51,6 @@ impl Error {
 pub type ProposalOf<B> = Proposal<B, StorageProof>;
 
 /// An interface for proposers.
-#[async_trait]
 pub trait ProposerInterface<Block: BlockT> {
 	/// Propose a collation using the supplied `InherentData` and the provided
 	/// `ParachainInherentData`.
@@ -92,7 +89,6 @@ impl<B, T> Proposer<B, T> {
 	}
 }
 
-#[async_trait]
 impl<B, T> ProposerInterface<B> for Proposer<B, T>
 where
 	B: sp_runtime::traits::Block,

diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -6,7 +6,6 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-async-trait = "0.1.73"
 futures = "0.3.28"
 parking_lot = "0.12.1"
 tracing = "0.1.37"

diff --git a/cumulus/client/consensus/relay-chain/src/import_queue.rs b/cumulus/client/consensus/relay-chain/src/import_queue.rs
@@ -43,7 +43,6 @@ impl<Client, Block, CIDP> Verifier<Client, Block, CIDP> {
 	}
 }
 
-#[async_trait::async_trait]
 impl<Client, Block, CIDP> VerifierT<Block> for Verifier<Client, Block, CIDP>
 where
 	Block: BlockT,

diff --git a/cumulus/client/consensus/relay-chain/src/lib.rs b/cumulus/client/consensus/relay-chain/src/lib.rs
@@ -140,7 +140,6 @@ where
 	}
 }
 
-#[async_trait::async_trait]
 impl<B, PF, BI, RCInterface, CIDP> ParachainConsensus<B>
 	for RelayChainConsensus<B, PF, BI, RCInterface, CIDP>
 where

diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
@@ -6,7 +6,6 @@ description = "Cumulus-specific networking protocol"
 edition.workspace = true
 
 [dependencies]
-async-trait = "0.1.73"
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
 futures = "0.3.28"
 futures-timer = "3.0.2"

diff --git a/cumulus/client/network/src/tests.rs b/cumulus/client/network/src/tests.rs
@@ -15,7 +15,6 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
-use async_trait::async_trait;
 use cumulus_primitives_core::relay_chain::BlockId;
 use cumulus_relay_chain_inprocess_interface::{check_block_in_chain, BlockCheckStatus};
 use cumulus_relay_chain_interface::{
@@ -76,7 +75,6 @@ impl DummyRelayChainInterface {
 	}
 }
 
-#[async_trait]
 impl RelayChainInterface for DummyRelayChainInterface {
 	async fn validators(&self, _: PHash) -> RelayChainResult<Vec<ValidatorId>> {
 		Ok(self.data.lock().validators.clone())

diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
@@ -28,7 +28,6 @@ polkadot-primitives = { path = "../../../polkadot/primitives" }
 # Cumulus
 cumulus-primitives-core = { path = "../../primitives/core" }
 cumulus-relay-chain-interface = { path = "../relay-chain-interface" }
-async-trait = "0.1.73"
 
 [dev-dependencies]
 tokio = { version = "1.32.0", features = ["macros"] }

diff --git a/cumulus/client/pov-recovery/src/lib.rs b/cumulus/client/pov-recovery/src/lib.rs
@@ -82,7 +82,6 @@ const LOG_TARGET: &str = "cumulus-pov-recovery";
 
 /// Test-friendly wrapper trait for the overseer handle.
 /// Can be used to simulate failing recovery requests.
-#[async_trait::async_trait]
 pub trait RecoveryHandle: Send {
 	async fn send_recovery_msg(
 		&mut self,
@@ -91,7 +90,6 @@ pub trait RecoveryHandle: Send {
 	);
 }
 
-#[async_trait::async_trait]
 impl RecoveryHandle for OverseerHandle {
 	async fn send_recovery_msg(
 		&mut self,

diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.1.0"
 edition.workspace = true
 
 [dependencies]
-async-trait = "0.1.73"
 futures = "0.3.28"
 futures-timer = "3.0.2"
 

diff --git a/cumulus/client/relay-chain-inprocess-interface/src/lib.rs b/cumulus/client/relay-chain-inprocess-interface/src/lib.rs
@@ -16,7 +16,6 @@
 
 use std::{pin::Pin, sync::Arc, time::Duration};
 
-use async_trait::async_trait;
 use cumulus_primitives_core::{
 	relay_chain::{
 		runtime_api::ParachainHost, Block as PBlock, BlockId, CommittedCandidateReceipt,
@@ -66,7 +65,6 @@ impl RelayChainInProcessInterface {
 	}
 }
 
-#[async_trait]
 impl RelayChainInterface for RelayChainInProcessInterface {
 	async fn retrieve_dmq_contents(
 		&self,

diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -15,7 +15,6 @@ sp-state-machine = { path = "../../../substrate/primitives/state-machine" }
 sc-client-api = { path = "../../../substrate/client/api" }
 
 futures = "0.3.28"
-async-trait = "0.1.73"
 thiserror = "1.0.48"
 jsonrpsee-core = "0.16.2"
 parity-scale-codec = "3.6.4"
diff --git a/cumulus/client/relay-chain-interface/src/lib.rs b/cumulus/client/relay-chain-interface/src/lib.rs
@@ -21,7 +21,6 @@ use sc_client_api::StorageProof;
 
 use futures::Stream;
 
-use async_trait::async_trait;
 use jsonrpsee_core::Error as JsonRpcError;
 use parity_scale_codec::Error as CodecError;
 use sp_api::ApiError;
@@ -96,7 +95,6 @@ impl<T: std::error::Error + Send + Sync + 'static> From<Box<T>> for RelayChainEr
 }
 
 /// Trait that provides all necessary methods for interaction between collator and relay chain.
-#[async_trait]
 pub trait RelayChainInterface: Send + Sync {
 	/// Fetch a storage item by key.
 	async fn get_storage_by_key(
@@ -196,7 +194,6 @@ pub trait RelayChainInterface: Send + Sync {
 	) -> RelayChainResult<StorageProof>;
 }
 
-#[async_trait]
 impl<T> RelayChainInterface for Arc<T>
 where
 	T: RelayChainInterface + ?Sized,

diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -38,6 +38,5 @@ cumulus-primitives-core = { path = "../../primitives/core" }
 
 array-bytes = "6.1"
 tracing = "0.1.37"
-async-trait = "0.1.73"
 futures = "0.3.28"
 
diff --git a/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs b/cumulus/client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
@@ -53,7 +53,6 @@ impl BlockChainRpcClient {
 	}
 }
 
-#[async_trait::async_trait]
 impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	async fn validators(
 		&self,
@@ -366,7 +365,6 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
 	}
 }
 
-#[async_trait::async_trait]
 impl AuthorityDiscovery<Block> for BlockChainRpcClient {
 	async fn authorities(
 		&self,

diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -30,7 +30,6 @@ futures-timer = "3.0.2"
 parity-scale-codec = "3.6.4"
 jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
 tracing = "0.1.37"
-async-trait = "0.1.73"
 url = "2.4.0"
 serde_json = "1.0.107"
 serde = "1.0.188"

diff --git a/cumulus/client/relay-chain-rpc-interface/src/lib.rs b/cumulus/client/relay-chain-rpc-interface/src/lib.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use async_trait::async_trait;
 use core::time::Duration;
 use cumulus_primitives_core::{
 	relay_chain::{
@@ -64,7 +63,6 @@ impl RelayChainRpcInterface {
 	}
 }
 
-#[async_trait]
 impl RelayChainInterface for RelayChainRpcInterface {
 	async fn retrieve_dmq_contents(
 		&self,

diff --git a/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs b/cumulus/client/relay-chain-rpc-interface/src/light_client_worker.rs
@@ -60,7 +60,6 @@ struct SimpleStringSender {
 	chain_id: ChainId,
 }
 
-#[async_trait::async_trait]
 impl TransportSenderT for SimpleStringSender {
 	type Error = LightClientError;
 
@@ -76,7 +75,6 @@ struct SimpleStringReceiver {
 	inner: JsonRpcResponses,
 }
 
-#[async_trait::async_trait]
 impl TransportReceiverT for SimpleStringReceiver {
 	type Error = LightClientError;
 

diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
@@ -11,7 +11,6 @@ name = "polkadot-parachain"
 path = "src/main.rs"
 
 [dependencies]
-async-trait = "0.1.73"
 clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.28"

diff --git a/cumulus/polkadot-parachain/src/service.rs b/cumulus/polkadot-parachain/src/service.rs
@@ -1173,7 +1173,6 @@ impl<Client, AuraId> Clone for WaitForAuraConsensus<Client, AuraId> {
 	}
 }
 
-#[async_trait::async_trait]
 impl<Client, AuraId> ParachainConsensus<Block> for WaitForAuraConsensus<Client, AuraId>
 where
 	Client: sp_api::ProvideRuntimeApi<Block> + Send + Sync,
@@ -1215,7 +1214,6 @@ struct Verifier<Client, AuraId> {
 	_phantom: PhantomData<AuraId>,
 }
 
-#[async_trait::async_trait]
 impl<Client, AuraId> VerifierT<Block> for Verifier<Client, AuraId>
 where
 	Client: sp_api::ProvideRuntimeApi<Block> + Send + Sync,

diff --git a/cumulus/primitives/parachain-inherent/Cargo.toml b/cumulus/primitives/parachain-inherent/Cargo.toml
@@ -5,7 +5,6 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-async-trait = { version = "0.1.73", optional = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 tracing = { version = "0.1.37", optional = true }
@@ -29,7 +28,6 @@ cumulus-test-relay-sproof-builder = { path = "../../test/relay-sproof-builder",
 [features]
 default = [ "std" ]
 std = [
-	"async-trait",
 	"codec/std",
 	"cumulus-primitives-core/std",
 	"cumulus-relay-chain-interface",

diff --git a/cumulus/primitives/parachain-inherent/src/client_side.rs b/cumulus/primitives/parachain-inherent/src/client_side.rs
@@ -179,7 +179,6 @@ impl ParachainInherentData {
 	}
 }
 
-#[async_trait::async_trait]
 impl sp_inherents::InherentDataProvider for ParachainInherentData {
 	async fn provide_inherent_data(
 		&self,

diff --git a/cumulus/primitives/parachain-inherent/src/mock.rs b/cumulus/primitives/parachain-inherent/src/mock.rs
@@ -148,7 +148,6 @@ impl MockXcmConfig {
 	}
 }
 
-#[async_trait::async_trait]
 impl<R: Send + Sync + GenerateRandomness<u64>> InherentDataProvider
 	for MockValidationDataInherentDataProvider<R>
 {

diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
@@ -10,7 +10,6 @@ name = "test-parachain"
 path = "src/main.rs"
 
 [dependencies]
-async-trait = "0.1.73"
 clap = { version = "4.4.6", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,7 +191,6 @@ where @@
     	}
     }
-    #[async_trait::async_trait]
     impl<B, CIDP, W> ParachainConsensus<B> for AuraConsensus<B, CIDP, W>
     where
     	B: BlockT,
@@ Expand Down @@