Small refactoring in transaction pool (#7179)

Author: tcoratger

crates/transaction-pool/src/pool/blob.rs

@@ -433,18 +433,19 @@ impl PartialOrd<Self> for BlobOrd {
 }
 
 impl Ord for BlobOrd {
+    /// Compares two `BlobOrd` instances.
+    ///
+    /// The comparison is performed in reverse order based on the priority field. This is
+    /// because transactions with larger negative values in the priority field will take more fee
+    /// jumps, making them take longer to become executable. Therefore, transactions with lower
+    /// ordering should return `Greater`, ensuring they are evicted first.
+    ///
+    /// If the priority values are equal, the submission ID is used to break ties.
     fn cmp(&self, other: &Self) -> Ordering {
-        // order in reverse, so transactions with a lower ordering return Greater - this is
-        // important because transactions with larger negative values will take more fee jumps and
-        // it will take longer to become executable, so those should be evicted first
-        let ord = other.priority.cmp(&self.priority);
-
-        // use submission_id to break ties
-        if ord == Ordering::Equal {
-            self.submission_id.cmp(&other.submission_id)
-        } else {
-            ord
-        }
+        other
+            .priority
+            .cmp(&self.priority)
+            .then_with(|| self.submission_id.cmp(&other.submission_id))
     }
 }
 

crates/transaction-pool/src/traits.rs

@@ -494,17 +494,15 @@ impl PropagateKind {
     /// Returns the peer the transaction was sent to
     pub const fn peer(&self) -> &PeerId {
         match self {
-            PropagateKind::Full(peer) => peer,
-            PropagateKind::Hash(peer) => peer,
+            PropagateKind::Full(peer) | PropagateKind::Hash(peer) => peer,
         }
     }
 }
 
 impl From<PropagateKind> for PeerId {
     fn from(value: PropagateKind) -> Self {
         match value {
-            PropagateKind::Full(peer) => peer,
-            PropagateKind::Hash(peer) => peer,
+            PropagateKind::Full(peer) | PropagateKind::Hash(peer) => peer,
         }
     }
 }

crates/transaction-pool/src/validate/mod.rs

@@ -126,8 +126,7 @@ impl<T: PoolTransaction> ValidTransaction<T> {
     /// Consumes the wrapper and returns the transaction.
     pub fn into_transaction(self) -> T {
         match self {
-            Self::Valid(transaction) => transaction,
-            Self::ValidWithSidecar { transaction, .. } => transaction,
+            Self::Valid(transaction) | Self::ValidWithSidecar { transaction, .. } => transaction,
         }
     }