fix merge

binaries/cuprated/src/txpool/incoming_tx.rs

@@ -98,6 +98,7 @@ impl Service<IncomingTxs> for IncomingTxHandler {
     }
 }
 
+#[expect(clippy::too_many_arguments)]
 async fn handle_incoming_txs(
     txs: Vec<Bytes>,
     state: TxState<NetworkAddress>,
@@ -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 {

p2p/dandelion-tower/src/router.rs

@@ -74,7 +74,7 @@ pub enum TxState<Id> {
 }
 
 impl<Id> TxState<Id> {
-    pub fn state_stem(&self) -> bool {
+    pub const fn state_stem(&self) -> bool {
         matches!(self, Self::Local | Self::Stem { .. })
     }
 }

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.

storage/txpool/src/service/read.rs

@@ -4,7 +4,6 @@
     clippy::unnecessary_wraps,
     reason = "TODO: finish implementing the signatures from <https://github.com/Cuprate/cuprate/pull/297>"
 )]
-
 use std::{
     collections::{HashMap, HashSet},
     sync::Arc,

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 {