f move struct to oubound_payments

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -77,7 +77,7 @@ use core::time::Duration;
 use core::ops::Deref;
 
 // Re-export this for use in the public API.
-pub use crate::ln::outbound_payment::{PaymentSendFailure, Retry, RetryableSendFailure};
+pub use crate::ln::outbound_payment::{PaymentSendFailure, Retry, RetryableSendFailure, RecipientOnionFields};
 
 // We hold various information about HTLC relay in the HTLC objects in Channel itself:
 //
@@ -226,38 +226,6 @@ impl Readable for PaymentId {
 	}
 }
 
-/// Information which is provided, encrypted, to the payment recipient when sending HTLCs.
-///
-/// This should generally be constructed with data communicated to us from the recipient (via some
-/// form of invoice).
-#[derive(Clone)]
-pub struct RecipientOnionFields {
-	/// The [`PaymentSecret`] which is an arbitrary 32 bytes provided by the recipient for us to
-	/// repeat in the onion. It is unrelated to `payment_hash` (or [`PaymentPreimage`]) and exists
-	/// to authenticate the sender to the recipient and prevent payment-probing (deanonymization)
-	/// attacks.
-	///
-	/// If you do not have one, the [`Route`] you pay over must not contain multiple paths as
-	/// multi-path payments require a recipient-provided secret.
-	pub payment_secret: Option<PaymentSecret>,
-}
-
-impl RecipientOnionFields {
-	/// Creates a [`RecipientOnionFields`] from only a [`PaymentSecret`]. This is the most common
-	/// set of onion fields for today's BOLT11 invoices - most nodes require a [`PaymentSecret`]
-	/// but do not require or provide any further data.
-	pub fn secret_only(payment_secret: PaymentSecret) -> Self {
-		Self { payment_secret: Some(payment_secret) }
-	}
-
-	/// Creates a new [`RecipientOnionFields`] with no fields. This generally does not create
-	/// payable HTLCs except for spontaneous payments, i.e. this should generally only be used for
-	/// calls to [`ChannelManager::send_spontaneous_payment`].
-	pub fn spontaneous_empty() -> Self {
-		Self { payment_secret: None }
-	}
-}
-
 /// An identifier used to uniquely identify an intercepted HTLC to LDK.
 ///
 /// This is not exported to bindings users as we just use [u8; 32] directly

lightning/src/ln/outbound_payment.rs

@@ -404,6 +404,40 @@ pub enum PaymentSendFailure {
 	},
 }
 
+/// Information which is provided, encrypted, to the payment recipient when sending HTLCs.
+///
+/// This should generally be constructed with data communicated to us from the recipient (via some
+/// form of invoice).
+#[derive(Clone)]
+pub struct RecipientOnionFields {
+	/// The [`PaymentSecret`] which is an arbitrary 32 bytes provided by the recipient for us to
+	/// repeat in the onion. It is unrelated to `payment_hash` (or [`PaymentPreimage`]) and exists
+	/// to authenticate the sender to the recipient and prevent payment-probing (deanonymization)
+	/// attacks.
+	///
+	/// If you do not have one, the [`Route`] you pay over must not contain multiple paths as
+	/// multi-path payments require a recipient-provided secret.
+	pub payment_secret: Option<PaymentSecret>,
+}
+
+impl RecipientOnionFields {
+	/// Creates a [`RecipientOnionFields`] from only a [`PaymentSecret`]. This is the most common
+	/// set of onion fields for today's BOLT11 invoices - most nodes require a [`PaymentSecret`]
+	/// but do not require or provide any further data.
+	pub fn secret_only(payment_secret: PaymentSecret) -> Self {
+		Self { payment_secret: Some(payment_secret) }
+	}
+
+	/// Creates a new [`RecipientOnionFields`] with no fields. This generally does not create
+	/// payable HTLCs except for spontaneous payments, i.e. this should generally only be used for
+	/// calls to [`ChannelManager::send_spontaneous_payment`].
+	///
+	/// [`ChannelManager::send_spontaneous_payment`]: super::channelmanager::ChannelManager::send_spontaneous_payment
+	pub fn spontaneous_empty() -> Self {
+		Self { payment_secret: None }
+	}
+}
+
 pub(super) struct OutboundPayments {
 	pub(super) pending_outbound_payments: Mutex<HashMap<PaymentId, PendingOutboundPayment>>,
 	pub(super) retry_lock: Mutex<()>,