From e109896dbef4e2bef0872761d056e56f0684f33f Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Wed, 15 Nov 2023 04:15:37 -0800 Subject: [PATCH] chore: remove unnecessary async_trait usage (#5433) --- crates/interfaces/src/consensus.rs | 2 -- crates/interfaces/src/test_utils/bodies.rs | 1 - crates/interfaces/src/test_utils/headers.rs | 1 - crates/stages/src/test_utils/runner.rs | 1 - crates/transaction-pool/src/test_utils/mod.rs | 1 - 5 files changed, 6 deletions(-) diff --git a/crates/interfaces/src/consensus.rs b/crates/interfaces/src/consensus.rs index 339db8403..bdb1c04ea 100644 --- a/crates/interfaces/src/consensus.rs +++ b/crates/interfaces/src/consensus.rs @@ -1,4 +1,3 @@ -use async_trait::async_trait; use reth_primitives::{ BlockHash, BlockNumber, GotExpected, GotExpectedBoxed, Header, InvalidTransactionError, SealedBlock, SealedHeader, B256, U256, @@ -9,7 +8,6 @@ use std::fmt::Debug; pub use reth_rpc_types::engine::ForkchoiceState; /// Consensus is a protocol that chooses canonical chain. -#[async_trait] #[auto_impl::auto_impl(&, Arc)] pub trait Consensus: Debug + Send + Sync { /// Validate if header is correct and follows consensus specification. diff --git a/crates/interfaces/src/test_utils/bodies.rs b/crates/interfaces/src/test_utils/bodies.rs index 3f4daccb5..2c79476ad 100644 --- a/crates/interfaces/src/test_utils/bodies.rs +++ b/crates/interfaces/src/test_utils/bodies.rs @@ -4,7 +4,6 @@ use crate::p2p::{ error::PeerRequestResult, priority::Priority, }; -use async_trait::async_trait; use futures::{future, Future, FutureExt}; use reth_primitives::{BlockBody, WithPeerId, B256}; use std::{ diff --git a/crates/interfaces/src/test_utils/headers.rs b/crates/interfaces/src/test_utils/headers.rs index 7fee42101..bf761846b 100644 --- a/crates/interfaces/src/test_utils/headers.rs +++ b/crates/interfaces/src/test_utils/headers.rs @@ -282,7 +282,6 @@ impl TestConsensus { } } -#[async_trait::async_trait] impl Consensus for TestConsensus { fn validate_header(&self, _header: &SealedHeader) -> Result<(), ConsensusError> { if self.fail_validation() { diff --git a/crates/stages/src/test_utils/runner.rs b/crates/stages/src/test_utils/runner.rs index 190ea3b53..ab8e23136 100644 --- a/crates/stages/src/test_utils/runner.rs +++ b/crates/stages/src/test_utils/runner.rs @@ -18,7 +18,6 @@ pub(crate) enum TestRunnerError { } /// A generic test runner for stages. -#[async_trait::async_trait] pub(crate) trait StageTestRunner { type S: Stage + 'static; diff --git a/crates/transaction-pool/src/test_utils/mod.rs b/crates/transaction-pool/src/test_utils/mod.rs index 8013fa3b9..05879c0cb 100644 --- a/crates/transaction-pool/src/test_utils/mod.rs +++ b/crates/transaction-pool/src/test_utils/mod.rs @@ -9,7 +9,6 @@ use crate::{ blobstore::InMemoryBlobStore, noop::MockTransactionValidator, Pool, PoolTransaction, TransactionOrigin, TransactionValidationOutcome, TransactionValidator, }; -use async_trait::async_trait; pub use gen::*; pub use mock::*; use std::{marker::PhantomData, sync::Arc};