f remove redundant test util

Author: valentinewallace

lightning/src/ln/async_payments_tests.rs

@@ -8,46 +8,25 @@
 // licenses.
 
 use bitcoin::secp256k1::Secp256k1;
-use crate::blinded_path::message::{BlindedMessagePath, MessageContext, OffersContext};
+use crate::blinded_path::message::{MessageContext, OffersContext};
 use crate::events::{Event, MessageSendEventsProvider, PaymentFailureReason};
 use crate::ln::channelmanager::PaymentId;
 use crate::ln::functional_test_utils::*;
-use crate::ln::msgs;
 use crate::ln::msgs::OnionMessageHandler;
+use crate::ln::offers_tests;
 use crate::ln::outbound_payment::Retry;
 use crate::offers::nonce::Nonce;
 use crate::onion_message::async_payments::{
     AsyncPaymentsMessage, AsyncPaymentsMessageHandler, ReleaseHeldHtlc,
 };
-use crate::onion_message::messenger::{
-    Destination, MessageRouter, MessageSendInstructions, PeeledOnion,
-};
+use crate::onion_message::messenger::{Destination, MessageRouter, MessageSendInstructions};
 use crate::onion_message::offers::OffersMessage;
 use crate::onion_message::packet::ParsedOnionMessageContents;
 use crate::prelude::*;
 use crate::types::features::Bolt12InvoiceFeatures;
 
 use core::convert::Infallible;
 
-#[cfg(async_payments)]
-fn extract_invoice_request_reply_path<'a, 'b, 'c>(
-	invreq_recipient: &Node<'a, 'b, 'c>, message: &msgs::OnionMessage
-) -> BlindedMessagePath {
-	match invreq_recipient.onion_messenger.peel_onion_message(message) {
-		Ok(PeeledOnion::Receive(invreq, context, reply_path)) => {
-			assert!(
-				matches!(invreq, ParsedOnionMessageContents::Offers(OffersMessage::InvoiceRequest(_)))
-			);
-			assert!(
-				matches!(context, Some(MessageContext::Offers(OffersContext::InvoiceRequest { .. })))
-			);
-			reply_path.unwrap()
-		},
-		Ok(PeeledOnion::Forward(_, _)) => panic!("Unexpected onion message forward"),
-		Err(e) => panic!("Failed to process onion message {:?}", e),
-	}
-}
-
 #[test]
 #[cfg(async_payments)]
 fn static_invoice_unknown_required_features() {
@@ -82,7 +61,7 @@ fn static_invoice_unknown_required_features() {
 	// Don't forward the invreq since we don't support retrieving the static invoice from the
 	// recipient's LSP yet, instead manually construct the response.
 	let invreq_om = nodes[0].onion_messenger.next_onion_message_for_peer(nodes[1].node.get_our_node_id()).unwrap();
-	let invreq_reply_path = extract_invoice_request_reply_path(&nodes[1], &invreq_om);
+	let invreq_reply_path = offers_tests::extract_invoice_request(&nodes[1], &invreq_om).1;
 	nodes[1].onion_messenger.send_onion_message(
 		ParsedOnionMessageContents::<Infallible>::Offers(OffersMessage::StaticInvoice(static_invoice_unknown_req_features)),
 		MessageSendInstructions::WithoutReplyPath { destination: Destination::BlindedPath(invreq_reply_path) }
@@ -129,7 +108,7 @@ fn ignore_unexpected_static_invoice() {
 	// Don't forward the invreq since we don't support retrieving the static invoice from the
 	// recipient's LSP yet, instead manually construct the responses below.
 	let invreq_om = nodes[0].onion_messenger.next_onion_message_for_peer(nodes[1].node.get_our_node_id()).unwrap();
-	let invreq_reply_path = extract_invoice_request_reply_path(&nodes[1], &invreq_om);
+	let invreq_reply_path = offers_tests::extract_invoice_request(&nodes[1], &invreq_om).1;
 
 	// Create a static invoice to be sent over the reply path containing the original payment_id, but
 	// the static invoice corresponds to a different offer than was originally paid.
@@ -210,7 +189,7 @@ fn pays_static_invoice() {
 	// Don't forward the invreq since we don't support retrieving the static invoice from the
 	// recipient's LSP yet, instead manually construct the response.
 	let invreq_om = nodes[0].onion_messenger.next_onion_message_for_peer(nodes[1].node.get_our_node_id()).unwrap();
-	let invreq_reply_path = extract_invoice_request_reply_path(&nodes[1], &invreq_om);
+	let invreq_reply_path = offers_tests::extract_invoice_request(&nodes[1], &invreq_om).1;
 
 	nodes[1].onion_messenger.send_onion_message(
 		ParsedOnionMessageContents::<Infallible>::Offers(OffersMessage::StaticInvoice(static_invoice)),

lightning/src/ln/offers_tests.rs

@@ -199,7 +199,7 @@ fn extract_offer_nonce<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, message: &OnionMessa
 	}
 }
 
-fn extract_invoice_request<'a, 'b, 'c>(
+pub(super) fn extract_invoice_request<'a, 'b, 'c>(
 	node: &Node<'a, 'b, 'c>, message: &OnionMessage
 ) -> (InvoiceRequest, BlindedMessagePath) {
 	match node.onion_messenger.peel_onion_message(message) {