Refactor test phantom invoice creation to separate function

Unnecessary std feature also removed from tests helpers.

Author: freddiekrugerrand

lightning-invoice/src/utils.rs

@@ -1536,14 +1536,11 @@ mod test {
 		);
 	}
 
-	#[cfg(feature = "std")]
-	fn match_multi_node_invoice_routes<'a, 'b: 'a, 'c: 'b>(
+	fn create_multi_node_invoice<'a, 'b: 'a, 'c: 'b>(
 		invoice_amt: Option<u64>,
 		invoice_node: &Node<'a, 'b, 'c>,
 		network_multi_nodes: Vec<&Node<'a, 'b, 'c>>,
-		mut chan_ids_to_match: HashSet<u64>,
-		nodes_contains_public_channels: bool
-	){
+	) -> (crate::utils::Invoice, HashSet<u64>) {
 		let phantom_route_hints = network_multi_nodes.iter()
 			.map(|node| node.node.get_phantom_route_hints())
 			.collect::<Vec<PhantomRouteHints>>();
@@ -1556,9 +1553,19 @@ mod test {
 				3600, phantom_route_hints, &invoice_node.keys_manager, &invoice_node.keys_manager,
 				&invoice_node.logger, Currency::BitcoinTestnet, None, Duration::from_secs(1234567)).unwrap();
 
-		let invoice_hints = invoice.private_routes();
+		(invoice, phantom_scids)
+	}
+
+	fn match_multi_node_invoice_routes<'a, 'b: 'a, 'c: 'b>(
+		invoice_amt: Option<u64>,
+		invoice_node: &Node<'a, 'b, 'c>,
+		network_multi_nodes: Vec<&Node<'a, 'b, 'c>>,
+		mut chan_ids_to_match: HashSet<u64>,
+		nodes_contains_public_channels: bool
+	) {
+		let (invoice, phantom_scids) = create_multi_node_invoice(invoice_amt, invoice_node, network_multi_nodes);
 
-		for hint in invoice_hints {
+		for hint in invoice.private_routes() {
 			let hints = &(hint.0).0;
 			match hints.len() {
 				1 => {