refactor: use macros for FullScan and Sync requests builders

Author: reez

bdk-ffi/src/bdk.udl

@@ -272,37 +272,8 @@ interface TransactionError {
 
 typedef enum KeychainKind;
 
-/// Builds a [`FullScanRequest`].
-interface FullScanRequestBuilder {
-  [Throws=RequestBuilderError]
-  FullScanRequestBuilder inspect_spks_for_all_keychains(FullScanScriptInspector inspector);
 
-  [Throws=RequestBuilderError]
-  FullScanRequest build();
-};
-
-/// Builds a [`SyncRequest`].
-interface SyncRequestBuilder {
-  [Throws=RequestBuilderError]
-  SyncRequestBuilder inspect_spks(SyncScriptInspector inspector);
-
-  [Throws=RequestBuilderError]
-  SyncRequest build();
-};
-
-interface FullScanRequest {};
 
-interface SyncRequest {};
-
-[Trait, WithForeign]
-interface SyncScriptInspector {
-  void inspect(Script script, u64 total);
-};
-
-[Trait, WithForeign]
-interface FullScanScriptInspector {
-  void inspect(KeychainKind keychain, u32 index, Script script);
-};
 
 // ------------------------------------------------------------------------
 // bdk_wallet crate - wallet module

bdk-ffi/src/lib.rs

@@ -13,7 +13,6 @@ mod wallet;
 
 use crate::bitcoin::FeeRate;
 use crate::bitcoin::OutPoint;
-use crate::bitcoin::Script;
 use crate::error::AddressParseError;
 use crate::error::Bip32Error;
 use crate::error::Bip39Error;
@@ -32,17 +31,10 @@ use crate::error::PsbtFinalizeError;
 use crate::error::PsbtParseError;
 use crate::error::RequestBuilderError;
 use crate::error::TransactionError;
-use crate::types::FullScanRequest;
-use crate::types::FullScanRequestBuilder;
-use crate::types::FullScanScriptInspector;
 use crate::types::LockTime;
 use crate::types::PkOrF;
-use crate::types::SyncRequest;
-use crate::types::SyncRequestBuilder;
-use crate::types::SyncScriptInspector;
 
 use bdk_wallet::bitcoin::Network;
 use bdk_wallet::keys::bip39::WordCount;
-use bdk_wallet::KeychainKind;
 
 uniffi::include_scaffolding!("bdk");

bdk-ffi/src/types.rs

@@ -261,25 +261,32 @@ impl From<BdkLocalOutput> for LocalOutput {
 }
 
 // Callback for the FullScanRequest
+#[uniffi::export(with_foreign)]
 pub trait FullScanScriptInspector: Sync + Send {
     fn inspect(&self, keychain: KeychainKind, index: u32, script: Arc<Script>);
 }
 
 // Callback for the SyncRequest
+#[uniffi::export(with_foreign)]
 pub trait SyncScriptInspector: Sync + Send {
     fn inspect(&self, script: Arc<Script>, total: u64);
 }
 
+#[derive(uniffi::Object)]
 pub struct FullScanRequestBuilder(
     pub(crate) Mutex<Option<BdkFullScanRequestBuilder<KeychainKind>>>,
 );
 
+#[derive(uniffi::Object)]
 pub struct SyncRequestBuilder(pub(crate) Mutex<Option<BdkSyncRequestBuilder<(KeychainKind, u32)>>>);
 
+#[derive(uniffi::Object)]
 pub struct FullScanRequest(pub(crate) Mutex<Option<BdkFullScanRequest<KeychainKind>>>);
 
+#[derive(uniffi::Object)]
 pub struct SyncRequest(pub(crate) Mutex<Option<BdkSyncRequest<(KeychainKind, u32)>>>);
 
+#[uniffi::export]
 impl SyncRequestBuilder {
     pub fn inspect_spks(
         &self,
@@ -314,6 +321,7 @@ impl SyncRequestBuilder {
     }
 }
 
+#[uniffi::export]
 impl FullScanRequestBuilder {
     pub fn inspect_spks_for_all_keychains(
         &self,