Make BlindedPath type private.

Users should use Blinded{Message,Payment}Path types instead.

Author: valentinewallace

fuzz/src/router.rs

@@ -13,7 +13,7 @@ use bitcoin::blockdata::script::Builder;
 use bitcoin::blockdata::transaction::TxOut;
 
 use lightning::blinded_path::payment::BlindedPaymentPath;
-use lightning::blinded_path::{BlindedHop, BlindedPath, IntroductionNode};
+use lightning::blinded_path::BlindedHop;
 use lightning::chain::transaction::OutPoint;
 use lightning::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
 use lightning::ln::channelmanager;
@@ -403,11 +403,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						}
 						(
 							payinfo,
-							BlindedPaymentPath(BlindedPath {
-								introduction_node: IntroductionNode::NodeId(hop.src_node_id),
-								blinding_point: dummy_pk,
-								blinded_hops,
-							}),
+							BlindedPaymentPath::from_raw(hop.src_node_id, dummy_pk, blinded_hops),
 						)
 					})
 					.collect();

lightning/src/blinded_path/message.rs

@@ -30,10 +30,10 @@ use crate::util::ser::{FixedLengthReader, LengthReadableArgs, Readable, Writeabl
 use core::mem;
 use core::ops::Deref;
 
-/// A [`BlindedPath`] to be used for sending or receiving a message, hiding the identity of the
+/// A blinded path to be used for sending or receiving a message, hiding the identity of the
 /// recipient.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct BlindedMessagePath(pub BlindedPath);
+pub struct BlindedMessagePath(pub(crate) BlindedPath);
 
 impl Writeable for BlindedMessagePath {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {

lightning/src/blinded_path/mod.rs

@@ -38,7 +38,7 @@ pub enum NextMessageHop {
 /// Onion messages and payments can be sent and received to blinded paths, which serve to hide the
 /// identity of the recipient.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct BlindedPath {
+pub(crate) struct BlindedPath {
 	/// To send to a blinded path, the sender first finds a route to the unblinded
 	/// `introduction_node`, which can unblind its [`encrypted_payload`] to find out the onion
 	/// message or payment's next hop and forward it along.
@@ -56,7 +56,7 @@ pub struct BlindedPath {
 
 /// The unblinded node in a [`BlindedPath`].
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub enum IntroductionNode {
+pub(crate) enum IntroductionNode {
 	/// The node id of the introduction node.
 	NodeId(PublicKey),
 	/// The short channel id of the channel leading to the introduction node. The [`Direction`]

lightning/src/blinded_path/payment.rs

@@ -33,10 +33,10 @@ use core::ops::Deref;
 #[allow(unused_imports)]
 use crate::prelude::*;
 
-/// A [`BlindedPath`] to be used for sending or receiving a payment, hiding the identity of the
+/// A blinded path to be used for sending or receiving a payment, hiding the identity of the
 /// recipient.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
-pub struct BlindedPaymentPath(pub BlindedPath);
+pub struct BlindedPaymentPath(pub(crate) BlindedPath);
 
 impl Writeable for BlindedPaymentPath {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
@@ -80,6 +80,17 @@ impl BlindedPaymentPath {
 			).map_err(|_| ())?,
 		})))
 	}
+
+	#[cfg(fuzzing)]
+	pub fn from_raw(
+		introduction_node_id: PublicKey, blinding_point: PublicKey, blinded_hops: Vec<BlindedHop>
+	) -> Self {
+		Self(BlindedPath {
+			introduction_node: IntroductionNode::NodeId(introduction_node_id),
+			blinding_point,
+			blinded_hops,
+		})
+	}
 }
 
 /// An intermediate node, its outbound channel, and relay parameters.