f Move uniffi LSPS1PaymentInfo types next to the pre-existing ones

.. as having them in two places doesn't make sense

Author: tnull

src/liquidity.rs

@@ -1307,66 +1307,8 @@ pub struct LSPS1OrderStatus {
 #[cfg(not(feature = "uniffi"))]
 type LSPS1PaymentInfo = lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo;
 
-/// Details regarding how to pay for an order.
 #[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct LSPS1PaymentInfo {
-	/// A Lightning payment using BOLT 11.
-	pub bolt11: Option<crate::uniffi_types::LSPS1Bolt11PaymentInfo>,
-	/// An onchain payment.
-	pub onchain: Option<LSPS1OnchainPaymentInfo>,
-}
-
-#[cfg(feature = "uniffi")]
-impl From<lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo> for LSPS1PaymentInfo {
-	fn from(value: lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo) -> Self {
-		LSPS1PaymentInfo {
-			bolt11: value.bolt11.map(|b| b.into()),
-			onchain: value.onchain.map(|o| o.into()),
-		}
-	}
-}
-
-/// An onchain payment.
-#[cfg(feature = "uniffi")]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct LSPS1OnchainPaymentInfo {
-	/// Indicates the current state of the payment.
-	pub state: lightning_liquidity::lsps1::msgs::LSPS1PaymentState,
-	/// The datetime when the payment option expires.
-	pub expires_at: LSPSDateTime,
-	/// The total fee the LSP will charge to open this channel in satoshi.
-	pub fee_total_sat: u64,
-	/// The amount the client needs to pay to have the requested channel openend.
-	pub order_total_sat: u64,
-	/// An on-chain address the client can send [`Self::order_total_sat`] to to have the channel
-	/// opened.
-	pub address: bitcoin::Address,
-	/// The minimum number of block confirmations that are required for the on-chain payment to be
-	/// considered confirmed.
-	pub min_onchain_payment_confirmations: Option<u16>,
-	/// The minimum fee rate for the on-chain payment in case the client wants the payment to be
-	/// confirmed without a confirmation.
-	pub min_fee_for_0conf: Arc<bitcoin::FeeRate>,
-	/// The address where the LSP will send the funds if the order fails.
-	pub refund_onchain_address: Option<bitcoin::Address>,
-}
-
-#[cfg(feature = "uniffi")]
-impl From<lightning_liquidity::lsps1::msgs::LSPS1OnchainPaymentInfo> for LSPS1OnchainPaymentInfo {
-	fn from(value: lightning_liquidity::lsps1::msgs::LSPS1OnchainPaymentInfo) -> Self {
-		Self {
-			state: value.state,
-			expires_at: value.expires_at,
-			fee_total_sat: value.fee_total_sat,
-			order_total_sat: value.order_total_sat,
-			address: value.address,
-			min_onchain_payment_confirmations: value.min_onchain_payment_confirmations,
-			min_fee_for_0conf: Arc::new(value.min_fee_for_0conf),
-			refund_onchain_address: value.refund_onchain_address,
-		}
-	}
-}
+type LSPS1PaymentInfo = crate::uniffi_types::LSPS1PaymentInfo;
 
 #[derive(Debug, Clone)]
 pub(crate) struct LSPS2FeeResponse {

src/uniffi_types.rs

@@ -15,9 +15,7 @@ pub use crate::config::{
 	EsploraSyncConfig, MaxDustHTLCExposure,
 };
 pub use crate::graph::{ChannelInfo, ChannelUpdateInfo, NodeAnnouncementInfo, NodeInfo};
-pub use crate::liquidity::{
-	LSPS1OnchainPaymentInfo, LSPS1OrderStatus, LSPS1PaymentInfo, LSPS2ServiceConfig,
-};
+pub use crate::liquidity::{LSPS1OrderStatus, LSPS2ServiceConfig};
 pub use crate::logger::{LogLevel, LogRecord, LogWriter};
 pub use crate::payment::store::{
 	ConfirmationStatus, LSPFeeLimits, PaymentDirection, PaymentKind, PaymentStatus,
@@ -607,6 +605,24 @@ impl std::fmt::Display for Bolt11Invoice {
 	}
 }
 
+/// Details regarding how to pay for an order.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct LSPS1PaymentInfo {
+	/// A Lightning payment using BOLT 11.
+	pub bolt11: Option<crate::uniffi_types::LSPS1Bolt11PaymentInfo>,
+	/// An onchain payment.
+	pub onchain: Option<LSPS1OnchainPaymentInfo>,
+}
+
+impl From<lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo> for LSPS1PaymentInfo {
+	fn from(value: lightning_liquidity::lsps1::msgs::LSPS1PaymentInfo) -> Self {
+		LSPS1PaymentInfo {
+			bolt11: value.bolt11.map(|b| b.into()),
+			onchain: value.onchain.map(|o| o.into()),
+		}
+	}
+}
+
 /// A Lightning payment using BOLT 11.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct LSPS1Bolt11PaymentInfo {
@@ -634,6 +650,45 @@ impl From<lightning_liquidity::lsps1::msgs::LSPS1Bolt11PaymentInfo> for LSPS1Bol
 	}
 }
 
+/// An onchain payment.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct LSPS1OnchainPaymentInfo {
+	/// Indicates the current state of the payment.
+	pub state: lightning_liquidity::lsps1::msgs::LSPS1PaymentState,
+	/// The datetime when the payment option expires.
+	pub expires_at: LSPSDateTime,
+	/// The total fee the LSP will charge to open this channel in satoshi.
+	pub fee_total_sat: u64,
+	/// The amount the client needs to pay to have the requested channel openend.
+	pub order_total_sat: u64,
+	/// An on-chain address the client can send [`Self::order_total_sat`] to to have the channel
+	/// opened.
+	pub address: bitcoin::Address,
+	/// The minimum number of block confirmations that are required for the on-chain payment to be
+	/// considered confirmed.
+	pub min_onchain_payment_confirmations: Option<u16>,
+	/// The minimum fee rate for the on-chain payment in case the client wants the payment to be
+	/// confirmed without a confirmation.
+	pub min_fee_for_0conf: Arc<bitcoin::FeeRate>,
+	/// The address where the LSP will send the funds if the order fails.
+	pub refund_onchain_address: Option<bitcoin::Address>,
+}
+
+impl From<lightning_liquidity::lsps1::msgs::LSPS1OnchainPaymentInfo> for LSPS1OnchainPaymentInfo {
+	fn from(value: lightning_liquidity::lsps1::msgs::LSPS1OnchainPaymentInfo) -> Self {
+		Self {
+			state: value.state,
+			expires_at: value.expires_at,
+			fee_total_sat: value.fee_total_sat,
+			order_total_sat: value.order_total_sat,
+			address: value.address,
+			min_onchain_payment_confirmations: value.min_onchain_payment_confirmations,
+			min_fee_for_0conf: Arc::new(value.min_fee_for_0conf),
+			refund_onchain_address: value.refund_onchain_address,
+		}
+	}
+}
+
 impl UniffiCustomTypeConverter for LSPS1OrderId {
 	type Builtin = String;