Use natural priority ordering to simplify should_replace.

miner/src/pool/mod.rs

@@ -83,20 +83,20 @@ impl PendingSettings {
 }
 
 /// Transaction priority.
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, PartialOrd,  Clone, Copy)]
 pub(crate) enum Priority {
-	/// Local transactions (high priority)
-	///
-	/// Transactions either from a local account or
-	/// submitted over local RPC connection via `eth_sendRawTransaction`
-	Local,
+	/// Regular transactions received over the network. (no priority boost)
+	Regular,
 	/// Transactions from retracted blocks (medium priority)
 	///
 	/// When block becomes non-canonical we re-import the transactions it contains
 	/// to the queue and boost their priority.
 	Retracted,
-	/// Regular transactions received over the network. (no priority boost)
-	Regular,
+	/// Local transactions (high priority)
+	///
+	/// Transactions either from a local account or
+	/// submitted over local RPC connection via `eth_sendRawTransaction`
+	Local,
 }
 
 impl Priority {

miner/src/pool/scoring.rs

@@ -108,18 +108,9 @@ impl txpool::Scoring<VerifiedTransaction> for NonceAndGasPrice {
 				cmp::Ordering::Equal => self.choose(old, new) == txpool::scoring::Choice::ReplaceOld,
 			}
 		} else {
-			// Always kick out non-local transactions in favour of local ones.
-			if new.priority().is_local() && !old.priority().is_local() {
-				return true;
-			}
-			// And never kick out local transactions in favour of external ones.
-			if !new.priority().is_local() && old.priority.is_local() {
-				return false;
-			}
-
-			let old_gp = old.transaction.gas_price;
-			let new_gp = new.transaction.gas_price;
-			old_gp < new_gp
+			let old_score = (old.priority(), old.transaction.gas_price);
+			let new_score = (new.priority(), new.transaction.gas_price);
+			new_score > old_score
 		}
 	}
 }