refactor: use macros for LockTime and PkOrF

Author: reez

bdk-ffi/src/bdk.udl

@@ -283,18 +283,6 @@ typedef interface Policy;
 
 typedef enum SatisfiableItem;
 
-[Enum]
-interface PkOrF {
-  Pubkey(string value);
-  XOnlyPubkey(string value);
-  Fingerprint(string value);
-};
-
-[Enum]
-interface LockTime {
-  Blocks(u32 height);
-  Seconds(u32 consensus_time);
-};
 
 typedef enum Satisfaction;
 

bdk-ffi/src/lib.rs

@@ -31,8 +31,6 @@ use crate::error::PsbtFinalizeError;
 use crate::error::PsbtParseError;
 use crate::error::RequestBuilderError;
 use crate::error::TransactionError;
-use crate::types::LockTime;
-use crate::types::PkOrF;
 
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::keys::bip39::WordCount;

bdk-ffi/src/types.rs

@@ -486,7 +486,7 @@ impl From<BdkSatisfiableItem> for SatisfiableItem {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, uniffi::Enum)]
 pub enum PkOrF {
     Pubkey { value: String },
     XOnlyPubkey { value: String },
@@ -509,7 +509,7 @@ impl From<BdkPkOrF> for PkOrF {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, uniffi::Enum)]
 pub enum LockTime {
     Blocks { height: u32 },
     Seconds { consensus_time: u32 },