f - Direction::select_node_id

Author: jkczyz

lightning/src/blinded_path/mod.rs

@@ -229,3 +229,17 @@ impl_writeable!(BlindedHop, {
 	encrypted_payload
 });
 
+impl Direction {
+	/// Returns the [`NodeId`] from the inputs corresponding to the direction.
+	pub fn select_node_id<'a>(&self, node_a: &'a NodeId, node_b: &'a NodeId) -> &'a NodeId {
+		let (node_one, node_two) = if node_a < node_b {
+			(node_a, node_b)
+		} else {
+			(node_b, node_a)
+		};
+		match self {
+			Direction::NodeOne => node_one,
+			Direction::NodeTwo => node_two,
+		}
+	}
+}

lightning/src/routing/router.rs

@@ -2558,15 +2558,7 @@ where L::Target: Logger {
 						);
 						match first_hop {
 							Some((counterparty_node_id, _)) => {
-								let (node_one, node_two) = if our_node_id < *counterparty_node_id {
-									(&our_node_id, counterparty_node_id)
-								} else {
-									(counterparty_node_id, &our_node_id)
-								};
-								match direction {
-									Direction::NodeOne => node_one,
-									Direction::NodeTwo => node_two,
-								}
+								direction.select_node_id(&our_node_id, counterparty_node_id)
 							},
 							None => continue,
 						}