types: remove unnecessary wrappers in non-uniffi case

This patch removes the Bolt12Invoice and StaticInvoice wrapper structs
from the non-uniffi code path, using the LDK types directly instead.

Problem:
The non-uniffi case was wrapping LDK types in unnecessary wrapper
structs. This adds boilerplate without any benefit since pure Rust
users can use the LDK types directly.

Solution:
For non-uniffi builds, PaidBolt12Invoice now directly contains:
- Arc<lightning::offers::invoice::Bolt12Invoice>
- Arc<lightning::offers::static_invoice::StaticInvoice>

The wrapper types are only needed for UniFFI builds where we need
to expose a controlled API surface through the bindings.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: vincenzopalazzo

src/payment/mod.rs

@@ -24,4 +24,6 @@ pub use store::{
 };
 pub use unified::{UnifiedPayment, UnifiedPaymentResult};
 
-pub use crate::types::{Bolt12Invoice, PaidBolt12Invoice, StaticInvoice};
+pub use crate::types::PaidBolt12Invoice;
+#[cfg(feature = "uniffi")]
+pub use crate::types::{Bolt12Invoice, StaticInvoice};

src/types.rs

@@ -7,8 +7,6 @@
 
 use std::fmt;
 use std::future::Future;
-#[cfg(not(feature = "uniffi"))]
-use std::ops::Deref;
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};
 
@@ -629,98 +627,6 @@ pub use crate::ffi::{Bolt12Invoice, PaidBolt12Invoice, StaticInvoice};
 mod invoice_types {
 	use super::*;
 
-	/// A wrapper around a [`lightning::offers::invoice::Bolt12Invoice`].
-	#[derive(Debug, Clone, PartialEq, Eq)]
-	pub struct Bolt12Invoice {
-		pub(crate) inner: LdkBolt12Invoice,
-	}
-
-	impl Bolt12Invoice {
-		/// Returns the [`lightning_types::payment::PaymentHash`] of the invoice.
-		pub fn payment_hash(&self) -> lightning_types::payment::PaymentHash {
-			self.inner.payment_hash()
-		}
-
-		/// Returns the amount in millisatoshis.
-		pub fn amount_msats(&self) -> u64 {
-			self.inner.amount_msats()
-		}
-
-		/// Writes `self` out to a `Vec<u8>`.
-		pub fn encode(&self) -> Vec<u8> {
-			self.inner.encode()
-		}
-	}
-
-	impl Deref for Bolt12Invoice {
-		type Target = LdkBolt12Invoice;
-		fn deref(&self) -> &Self::Target {
-			&self.inner
-		}
-	}
-
-	impl AsRef<LdkBolt12Invoice> for Bolt12Invoice {
-		fn as_ref(&self) -> &LdkBolt12Invoice {
-			self.deref()
-		}
-	}
-
-	impl From<LdkBolt12Invoice> for Bolt12Invoice {
-		fn from(invoice: LdkBolt12Invoice) -> Self {
-			Bolt12Invoice { inner: invoice }
-		}
-	}
-
-	/// A wrapper around a [`lightning::offers::static_invoice::StaticInvoice`].
-	///
-	/// A `StaticInvoice` is used for async payments where the recipient may be offline.
-	///
-	/// Unlike [`Bolt12Invoice`], a `StaticInvoice` does not support proof of payment
-	/// because the payment hash is not derived from a preimage known only to the recipient.
-	#[derive(Debug, Clone, PartialEq, Eq)]
-	pub struct StaticInvoice {
-		pub(crate) inner: LdkStaticInvoice,
-	}
-
-	impl StaticInvoice {
-		/// Returns the [`OfferId`] of the underlying [`Offer`] this invoice corresponds to.
-		///
-		/// [`Offer`]: lightning::offers::offer::Offer
-		/// [`OfferId`]: lightning::offers::offer::OfferId
-		pub fn offer_id(&self) -> lightning::offers::offer::OfferId {
-			self.inner.offer_id()
-		}
-
-		/// Whether the offer this invoice corresponds to has expired.
-		pub fn is_offer_expired(&self) -> bool {
-			self.inner.is_offer_expired()
-		}
-
-		/// Writes `self` out to a `Vec<u8>`.
-		pub fn encode(&self) -> Vec<u8> {
-			self.inner.encode()
-		}
-	}
-
-	impl Deref for StaticInvoice {
-		type Target = LdkStaticInvoice;
-		fn deref(&self) -> &Self::Target {
-			&self.inner
-		}
-	}
-
-	impl AsRef<LdkStaticInvoice> for StaticInvoice {
-		fn as_ref(&self) -> &LdkStaticInvoice {
-			self.deref()
-		}
-	}
-
-	impl From<LdkStaticInvoice> for StaticInvoice {
-		fn from(invoice: LdkStaticInvoice) -> Self {
-			StaticInvoice { inner: invoice }
-		}
-	}
-
 	/// Represents a BOLT12 invoice that was paid.
 	///
 	/// This is used in [`Event::PaymentSuccessful`] to provide proof of payment for BOLT12 payments.
@@ -729,19 +635,19 @@ mod invoice_types {
 	#[derive(Debug, Clone, PartialEq, Eq)]
 	pub enum PaidBolt12Invoice {
 		/// A standard BOLT12 invoice.
-		Bolt12Invoice(Arc<Bolt12Invoice>),
+		Bolt12Invoice(Arc<LdkBolt12Invoice>),
 		/// A static invoice for async payments.
-		StaticInvoice(Arc<StaticInvoice>),
+		StaticInvoice(Arc<LdkStaticInvoice>),
 	}
 
 	impl From<LdkPaidBolt12Invoice> for PaidBolt12Invoice {
 		fn from(ldk_invoice: LdkPaidBolt12Invoice) -> Self {
 			match ldk_invoice {
 				LdkPaidBolt12Invoice::Bolt12Invoice(invoice) => {
-					PaidBolt12Invoice::Bolt12Invoice(Arc::new(Bolt12Invoice { inner: invoice }))
+					PaidBolt12Invoice::Bolt12Invoice(Arc::new(invoice))
 				},
 				LdkPaidBolt12Invoice::StaticInvoice(invoice) => {
-					PaidBolt12Invoice::StaticInvoice(Arc::new(StaticInvoice { inner: invoice }))
+					PaidBolt12Invoice::StaticInvoice(Arc::new(invoice))
 				},
 			}
 		}
@@ -752,11 +658,11 @@ mod invoice_types {
 			match self {
 				PaidBolt12Invoice::Bolt12Invoice(invoice) => {
 					0u8.write(writer)?;
-					invoice.inner.encode().write(writer)?;
+					invoice.encode().write(writer)?;
 				},
 				PaidBolt12Invoice::StaticInvoice(invoice) => {
 					1u8.write(writer)?;
-					invoice.inner.encode().write(writer)?;
+					invoice.encode().write(writer)?;
 				},
 			}
 			Ok(())
@@ -771,12 +677,12 @@ mod invoice_types {
 				0 => {
 					let invoice =
 						LdkBolt12Invoice::try_from(bytes).map_err(|_| DecodeError::InvalidValue)?;
-					Ok(PaidBolt12Invoice::Bolt12Invoice(Arc::new(Bolt12Invoice { inner: invoice })))
+					Ok(PaidBolt12Invoice::Bolt12Invoice(Arc::new(invoice)))
 				},
 				1 => {
 					let invoice =
 						LdkStaticInvoice::try_from(bytes).map_err(|_| DecodeError::InvalidValue)?;
-					Ok(PaidBolt12Invoice::StaticInvoice(Arc::new(StaticInvoice { inner: invoice })))
+					Ok(PaidBolt12Invoice::StaticInvoice(Arc::new(invoice)))
 				},
 				_ => Err(DecodeError::InvalidValue),
 			}