diff --git a/binaries/cuprated/src/txpool/incoming_tx.rs b/binaries/cuprated/src/txpool/incoming_tx.rs index 14e98e05..a486738b 100644 --- a/binaries/cuprated/src/txpool/incoming_tx.rs +++ b/binaries/cuprated/src/txpool/incoming_tx.rs @@ -98,6 +98,7 @@ impl Service for IncomingTxHandler { } } +#[expect(clippy::too_many_arguments)] async fn handle_incoming_txs( txs: Vec, state: TxState, @@ -117,7 +118,7 @@ async fn handle_incoming_txs( .ready() .await .expect(PANIC_CRITICAL_SERVICE_ERROR) - .call(BlockChainContextRequest::GetContext) + .call(BlockChainContextRequest::Context) .await .expect(PANIC_CRITICAL_SERVICE_ERROR) else { @@ -147,7 +148,7 @@ async fn handle_incoming_txs( &mut txpool_write_handle, &mut dandelion_pool_manager, ) - .await + .await; } for stem_tx in stem_pool_txs { diff --git a/p2p/dandelion-tower/src/router.rs b/p2p/dandelion-tower/src/router.rs index 899b1235..c04dcaea 100644 --- a/p2p/dandelion-tower/src/router.rs +++ b/p2p/dandelion-tower/src/router.rs @@ -74,7 +74,7 @@ pub enum TxState { } impl TxState { - pub fn state_stem(&self) -> bool { + pub const fn state_stem(&self) -> bool { matches!(self, Self::Local | Self::Stem { .. }) } } diff --git a/storage/txpool/src/service/interface.rs b/storage/txpool/src/service/interface.rs index e1eb050c..0aa90491 100644 --- a/storage/txpool/src/service/interface.rs +++ b/storage/txpool/src/service/interface.rs @@ -8,7 +8,10 @@ use std::{ use cuprate_types::TransactionVerificationData; -use crate::{tx::TxEntry, types::{KeyImage, TransactionBlobHash, TransactionHash}}; +use crate::{ + tx::TxEntry, + types::{KeyImage, TransactionBlobHash, TransactionHash}, +}; //---------------------------------------------------------------------------------------------------- TxpoolReadRequest /// The transaction pool [`tower::Service`] read request type. diff --git a/storage/txpool/src/service/read.rs b/storage/txpool/src/service/read.rs index 41ee0198..bdeeb74b 100644 --- a/storage/txpool/src/service/read.rs +++ b/storage/txpool/src/service/read.rs @@ -4,7 +4,6 @@ clippy::unnecessary_wraps, reason = "TODO: finish implementing the signatures from " )] - use std::{ collections::{HashMap, HashSet}, sync::Arc, diff --git a/storage/txpool/src/types.rs b/storage/txpool/src/types.rs index f1c1d0f7..f507bbaa 100644 --- a/storage/txpool/src/types.rs +++ b/storage/txpool/src/types.rs @@ -19,6 +19,7 @@ pub type TransactionHash = [u8; 32]; /// A transaction blob hash. pub type TransactionBlobHash = [u8; 32]; +/// Information on the tx-pool. #[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Eq, Ord, Hash, Pod, Zeroable)] #[repr(C)] pub struct PoolInfo {