Remove unused expected_path_id

This was only used to assert logging but was only ever passed None.

Author: jkczyz

lightning/src/onion_message/functional_tests.rs

@@ -183,7 +183,7 @@ fn create_nodes(num_messengers: u8) -> Vec<MessengerNode> {
 	nodes
 }
 
-fn pass_along_path(path: &Vec<MessengerNode>, expected_path_id: Option<[u8; 32]>) {
+fn pass_along_path(path: &Vec<MessengerNode>) {
 	let mut prev_node = &path[0];
 	for node in path.into_iter().skip(1) {
 		let events = prev_node.messenger.release_pending_msgs();
@@ -204,7 +204,7 @@ fn one_hop() {
 
 	nodes[0].messenger.send_onion_message(&[], Destination::Node(nodes[1].get_node_pk()), test_msg, None).unwrap();
 	nodes[1].custom_handler.expect_message(TestCustomMessage::Response);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]
@@ -214,7 +214,7 @@ fn two_unblinded_hops() {
 
 	nodes[0].messenger.send_onion_message(&[nodes[1].get_node_pk()], Destination::Node(nodes[2].get_node_pk()), test_msg, None).unwrap();
 	nodes[2].custom_handler.expect_message(TestCustomMessage::Response);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]
@@ -227,7 +227,7 @@ fn two_unblinded_two_blinded() {
 
 	nodes[0].messenger.send_onion_message(&[nodes[1].get_node_pk(), nodes[2].get_node_pk()], Destination::BlindedPath(blinded_path), test_msg, None).unwrap();
 	nodes[4].custom_handler.expect_message(TestCustomMessage::Response);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]
@@ -240,7 +240,7 @@ fn three_blinded_hops() {
 
 	nodes[0].messenger.send_onion_message(&[], Destination::BlindedPath(blinded_path), test_msg, None).unwrap();
 	nodes[3].custom_handler.expect_message(TestCustomMessage::Response);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]
@@ -267,14 +267,14 @@ fn we_are_intro_node() {
 
 	nodes[0].messenger.send_onion_message(&[], Destination::BlindedPath(blinded_path), OnionMessageContents::Custom(test_msg.clone()), None).unwrap();
 	nodes[2].custom_handler.expect_message(TestCustomMessage::Response);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 
 	// Try with a two-hop blinded path where we are the introduction node.
 	let blinded_path = BlindedPath::new(&[nodes[0].get_node_pk(), nodes[1].get_node_pk()], &*nodes[1].keys_manager, &secp_ctx).unwrap();
 	nodes[0].messenger.send_onion_message(&[], Destination::BlindedPath(blinded_path), OnionMessageContents::Custom(test_msg), None).unwrap();
 	nodes[1].custom_handler.expect_message(TestCustomMessage::Response);
 	nodes.remove(2);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]
@@ -308,23 +308,23 @@ fn reply_path() {
 	let reply_path = BlindedPath::new(&[nodes[2].get_node_pk(), nodes[1].get_node_pk(), nodes[0].get_node_pk()], &*nodes[0].keys_manager, &secp_ctx).unwrap();
 	nodes[0].messenger.send_onion_message(&[nodes[1].get_node_pk(), nodes[2].get_node_pk()], Destination::Node(nodes[3].get_node_pk()), OnionMessageContents::Custom(test_msg.clone()), Some(reply_path)).unwrap();
 	nodes[3].custom_handler.expect_message(TestCustomMessage::Request);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 	// Make sure the last node successfully decoded the reply path.
 	nodes[0].custom_handler.expect_message(TestCustomMessage::Response);
 	nodes.reverse();
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 
 	// Destination::BlindedPath
 	let blinded_path = BlindedPath::new(&[nodes[1].get_node_pk(), nodes[2].get_node_pk(), nodes[3].get_node_pk()], &*nodes[3].keys_manager, &secp_ctx).unwrap();
 	let reply_path = BlindedPath::new(&[nodes[2].get_node_pk(), nodes[1].get_node_pk(), nodes[0].get_node_pk()], &*nodes[0].keys_manager, &secp_ctx).unwrap();
 
 	nodes[0].messenger.send_onion_message(&[], Destination::BlindedPath(blinded_path), OnionMessageContents::Custom(test_msg), Some(reply_path)).unwrap();
 	nodes[3].custom_handler.expect_message(TestCustomMessage::Request);
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 	// Make sure the last node successfully decoded the reply path.
 	nodes[0].custom_handler.expect_message(TestCustomMessage::Response);
 	nodes.reverse();
-	pass_along_path(&nodes, None);
+	pass_along_path(&nodes);
 }
 
 #[test]