Merge pull request #3807 from a-mpch/2025-05-rename-from-raw-to-from-blinded-path-payment

Rename `from_raw` to `from_blinded_path_and_payinfo` in `BlindedPaymentPath`

Author: valentinewallace

fuzz/src/router.rs

@@ -401,7 +401,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 								encrypted_payload: Vec::new(),
 							});
 						}
-						BlindedPaymentPath::from_raw(
+						BlindedPaymentPath::from_blinded_path_and_payinfo(
 							hop.src_node_id,
 							dummy_pk,
 							blinded_hops,

lightning/src/blinded_path/payment.rs

@@ -246,19 +246,27 @@ impl BlindedPaymentPath {
 		Self { inner_path, payinfo }
 	}
 
-	#[cfg(any(test, fuzzing))]
-	pub fn from_raw(
+	/// Builds a new [`BlindedPaymentPath`] from its constituent parts.
+	///
+	/// Useful when reconstructing a blinded path from previously serialized components.
+	///
+	/// Parameters:
+	/// * `introduction_node_id`: The public key of the introduction node in the path.
+	/// * `blinding_point`: The public key used for blinding the path.
+	/// * `blinded_hops`: The encrypted routing information for each hop in the path.
+	/// * `payinfo`: The [`BlindedPayInfo`] for the blinded path.
+	pub fn from_blinded_path_and_payinfo(
 		introduction_node_id: PublicKey, blinding_point: PublicKey, blinded_hops: Vec<BlindedHop>,
 		payinfo: BlindedPayInfo,
 	) -> Self {
-		Self {
-			inner_path: BlindedPath {
+		Self::from_parts(
+			BlindedPath {
 				introduction_node: IntroductionNode::NodeId(introduction_node_id),
 				blinding_point,
 				blinded_hops,
 			},
 			payinfo,
-		}
+		)
 	}
 
 	#[cfg(test)]

lightning/src/ln/max_payment_path_len_tests.rs

@@ -375,7 +375,7 @@ fn bolt12_invoice_too_large_blinded_paths() {
 	create_announced_chan_between_nodes(&nodes, 0, 1);
 
 	nodes[1].router.expect_blinded_payment_paths(vec![
-		BlindedPaymentPath::from_raw(
+		BlindedPaymentPath::from_blinded_path_and_payinfo(
 			PublicKey::from_slice(&[2; 33]).unwrap(), PublicKey::from_slice(&[2; 33]).unwrap(),
 			vec![
 				BlindedHop {

lightning/src/ln/msgs.rs

@@ -6067,7 +6067,7 @@ mod tests {
 		let trampoline_payload = OutboundTrampolinePayload::LegacyBlindedPathEntry {
 			amt_to_forward: 150_000_000,
 			outgoing_cltv_value: 800_000,
-			payment_paths: vec![BlindedPaymentPath::from_raw(
+			payment_paths: vec![BlindedPaymentPath::from_blinded_path_and_payinfo(
 				introduction_node,
 				blinding_point,
 				vec![],

lightning/src/offers/test_utils.rs

@@ -74,7 +74,7 @@ pub(super) fn privkey(byte: u8) -> SecretKey {
 
 pub(crate) fn payment_paths() -> Vec<BlindedPaymentPath> {
 	vec![
-		BlindedPaymentPath::from_raw(
+		BlindedPaymentPath::from_blinded_path_and_payinfo(
 			pubkey(40),
 			pubkey(41),
 			vec![
@@ -90,7 +90,7 @@ pub(crate) fn payment_paths() -> Vec<BlindedPaymentPath> {
 				features: BlindedHopFeatures::empty(),
 			},
 		),
-		BlindedPaymentPath::from_raw(
+		BlindedPaymentPath::from_blinded_path_and_payinfo(
 			pubkey(40),
 			pubkey(41),
 			vec![

lightning/src/routing/router.rs

@@ -3827,7 +3827,7 @@ mod tests {
 	}
 
 	fn dummy_blinded_path(intro_node: PublicKey, payinfo: BlindedPayInfo) -> BlindedPaymentPath {
-		BlindedPaymentPath::from_raw(
+		BlindedPaymentPath::from_blinded_path_and_payinfo(
 			intro_node, ln_test_utils::pubkey(42),
 			vec![
 				BlindedHop { blinded_node_id: ln_test_utils::pubkey(42 as u8), encrypted_payload: Vec::new() },
@@ -3838,7 +3838,7 @@ mod tests {
 	}
 
 	fn dummy_one_hop_blinded_path(intro_node: PublicKey, payinfo: BlindedPayInfo) -> BlindedPaymentPath {
-		BlindedPaymentPath::from_raw(
+		BlindedPaymentPath::from_blinded_path_and_payinfo(
 			intro_node, ln_test_utils::pubkey(42),
 			vec![
 				BlindedHop { blinded_node_id: ln_test_utils::pubkey(42 as u8), encrypted_payload: Vec::new() },
@@ -7871,7 +7871,9 @@ mod tests {
 			cltv_expiry_delta: 15,
 			features: BlindedHopFeatures::empty(),
 		};
-		let blinded_path = BlindedPaymentPath::from_raw(nodes[2], ln_test_utils::pubkey(42), blinded_hops, blinded_payinfo.clone());
+		let blinded_path = BlindedPaymentPath::from_blinded_path_and_payinfo(
+			nodes[2], ln_test_utils::pubkey(42), blinded_hops, blinded_payinfo.clone()
+		);
 		let payment_params = PaymentParameters::blinded(vec![blinded_path.clone(), blinded_path.clone()]);
 
 		// Make sure we can round-trip read and write blinded payment params.
@@ -7992,7 +7994,9 @@ mod tests {
 
 		let mut blinded_payinfo_2 = blinded_payinfo_1;
 		blinded_payinfo_2.htlc_maximum_msat = 70_000;
-		let blinded_path_2 = BlindedPaymentPath::from_raw(nodes[2], ln_test_utils::pubkey(43),
+		let blinded_path_2 = BlindedPaymentPath::from_blinded_path_and_payinfo(
+			nodes[2],
+			ln_test_utils::pubkey(43),
 			vec![
 				BlindedHop { blinded_node_id: ln_test_utils::pubkey(42 as u8), encrypted_payload: Vec::new() },
 				BlindedHop { blinded_node_id: ln_test_utils::pubkey(42 as u8), encrypted_payload: Vec::new() }