types: convert non-uniffi PaidBolt12Invoice to enum

This patch updates the non-uniffi version of PaidBolt12Invoice to use
the same enum structure as the uniffi version, ensuring consistency
across the codebase.

Problem:
The non-uniffi implementation still used the old struct-based approach
with a kind field and optional invoice fields, while the uniffi version
was updated to use a proper enum. This inconsistency would cause
confusion and potential bugs.

Solution:
Update the non-uniffi PaidBolt12Invoice to be a proper enum with
Bolt12Invoice and StaticInvoice variants, matching the uniffi version.
Also update the doc comment in event.rs to reference the new enum
variant path.

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

Author: vincenzopalazzo

src/event.rs

@@ -84,9 +84,9 @@ pub enum Event {
 		///
 		/// Will be `None` for non-BOLT12 payments.
 		///
-		/// Note that static invoices (indicated by [`crate::payment::PaidBolt12InvoiceKind::StaticInvoice`],
-		/// used for async payments) do not support proof of payment as the payment hash is not
-		/// derived from a preimage known only to the recipient.
+		/// Note that static invoices (indicated by [`PaidBolt12Invoice::StaticInvoice`], used for
+		/// async payments) do not support proof of payment as the payment hash is not derived
+		/// from a preimage known only to the recipient.
 		bolt12_invoice: Option<PaidBolt12Invoice>,
 	},
 	/// A sent payment has failed.

src/types.rs

@@ -721,63 +721,42 @@ mod invoice_types {
 		}
 	}
 
-	/// The kind of [`PaidBolt12Invoice`].
-	#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-	pub enum PaidBolt12InvoiceKind {
-		/// A standard BOLT12 invoice.
-		Bolt12Invoice,
-		/// A static invoice for async payments.
-		StaticInvoice,
-	}
-
 	/// Represents a BOLT12 invoice that was paid.
 	///
 	/// This is used in [`Event::PaymentSuccessful`] to provide proof of payment for BOLT12 payments.
 	///
 	/// [`Event::PaymentSuccessful`]: crate::Event::PaymentSuccessful
 	#[derive(Debug, Clone, PartialEq, Eq)]
-	pub struct PaidBolt12Invoice {
-		/// The kind of invoice that was paid.
-		pub kind: PaidBolt12InvoiceKind,
-		/// The paid BOLT12 invoice, if this is a regular BOLT12 invoice.
-		pub bolt12_invoice: Option<Arc<Bolt12Invoice>>,
-		/// The paid static invoice, if this is a static invoice (async payment).
-		pub static_invoice: Option<Arc<StaticInvoice>>,
+	pub enum PaidBolt12Invoice {
+		/// A standard BOLT12 invoice.
+		Bolt12Invoice(Arc<Bolt12Invoice>),
+		/// A static invoice for async payments.
+		StaticInvoice(Arc<StaticInvoice>),
 	}
 
 	impl From<LdkPaidBolt12Invoice> for PaidBolt12Invoice {
 		fn from(ldk_invoice: LdkPaidBolt12Invoice) -> Self {
 			match ldk_invoice {
-				LdkPaidBolt12Invoice::Bolt12Invoice(invoice) => PaidBolt12Invoice {
-					kind: PaidBolt12InvoiceKind::Bolt12Invoice,
-					bolt12_invoice: Some(Arc::new(Bolt12Invoice { inner: invoice })),
-					static_invoice: None,
+				LdkPaidBolt12Invoice::Bolt12Invoice(invoice) => {
+					PaidBolt12Invoice::Bolt12Invoice(Arc::new(Bolt12Invoice { inner: invoice }))
 				},
-				LdkPaidBolt12Invoice::StaticInvoice(invoice) => PaidBolt12Invoice {
-					kind: PaidBolt12InvoiceKind::StaticInvoice,
-					bolt12_invoice: None,
-					static_invoice: Some(Arc::new(StaticInvoice { inner: invoice })),
+				LdkPaidBolt12Invoice::StaticInvoice(invoice) => {
+					PaidBolt12Invoice::StaticInvoice(Arc::new(StaticInvoice { inner: invoice }))
 				},
 			}
 		}
 	}
 
 	impl Writeable for PaidBolt12Invoice {
 		fn write<W: Writer>(&self, writer: &mut W) -> Result<(), lightning::io::Error> {
-			match self.kind {
-				PaidBolt12InvoiceKind::Bolt12Invoice => {
+			match self {
+				PaidBolt12Invoice::Bolt12Invoice(invoice) => {
 					0u8.write(writer)?;
-					if let Some(invoice) = &self.bolt12_invoice {
-						let bytes = invoice.inner.encode();
-						bytes.write(writer)?;
-					}
+					invoice.inner.encode().write(writer)?;
 				},
-				PaidBolt12InvoiceKind::StaticInvoice => {
+				PaidBolt12Invoice::StaticInvoice(invoice) => {
 					1u8.write(writer)?;
-					if let Some(invoice) = &self.static_invoice {
-						let bytes = invoice.inner.encode();
-						bytes.write(writer)?;
-					}
+					invoice.inner.encode().write(writer)?;
 				},
 			}
 			Ok(())
@@ -792,20 +771,12 @@ mod invoice_types {
 				0 => {
 					let invoice =
 						LdkBolt12Invoice::try_from(bytes).map_err(|_| DecodeError::InvalidValue)?;
-					Ok(PaidBolt12Invoice {
-						kind: PaidBolt12InvoiceKind::Bolt12Invoice,
-						bolt12_invoice: Some(Arc::new(Bolt12Invoice { inner: invoice })),
-						static_invoice: None,
-					})
+					Ok(PaidBolt12Invoice::Bolt12Invoice(Arc::new(Bolt12Invoice { inner: invoice })))
 				},
 				1 => {
 					let invoice =
 						LdkStaticInvoice::try_from(bytes).map_err(|_| DecodeError::InvalidValue)?;
-					Ok(PaidBolt12Invoice {
-						kind: PaidBolt12InvoiceKind::StaticInvoice,
-						bolt12_invoice: None,
-						static_invoice: Some(Arc::new(StaticInvoice { inner: invoice })),
-					})
+					Ok(PaidBolt12Invoice::StaticInvoice(Arc::new(StaticInvoice { inner: invoice })))
 				},
 				_ => Err(DecodeError::InvalidValue),
 			}