From f04c1f7fa8c821a50e36210a99e892d96bcdbf92 Mon Sep 17 00:00:00 2001 From: Sudarsan Balaji Date: Thu, 28 Oct 2021 00:33:10 +0530 Subject: [PATCH] Remove callback interface --- src/bdk.udl | 6 +----- src/lib.rs | 16 ++++------------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/bdk.udl b/src/bdk.udl index e3ab62e..27c554d 100644 --- a/src/bdk.udl +++ b/src/bdk.udl @@ -120,10 +120,6 @@ interface BlockchainConfig { Esplora(EsploraConfig config); }; -callback interface BdkProgress { - void update(f32 progress, string? message); -}; - interface OnlineWallet { [Throws=BdkError] constructor(string descriptor, string? change_descriptor, Network network, DatabaseConfig database_config, BlockchainConfig blockchain_config); @@ -140,7 +136,7 @@ interface OnlineWallet { // OnlineWalletInterface Network get_network(); [Throws=BdkError] - void sync(BdkProgress progress_update, u32? max_address_param); + void sync(u32? max_address_param); [Throws=BdkError] string broadcast([ByRef] PartiallySignedBitcoinTransaction psbt); }; diff --git a/src/lib.rs b/src/lib.rs index e19ab21..9faf5f7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -154,13 +154,10 @@ pub trait BdkProgress: Send + Sync { fn update(&self, progress: f32, message: Option); } -struct BdkProgressHolder { - progress_update: Box, -} +struct BdkProgressHolder {} impl Progress for BdkProgressHolder { - fn update(&self, progress: f32, message: Option) -> Result<(), Error> { - self.progress_update.update(progress, message); + fn update(&self, _progress: f32, _message: Option) -> Result<(), Error> { Ok(()) } } @@ -238,16 +235,11 @@ impl OnlineWallet { self.wallet.lock().unwrap().network() } - fn sync( - &self, - progress_update: Box, - max_address_param: Option, - ) -> Result<(), BdkError> { - progress_update.update(21.0, Some("message".to_string())); + fn sync(&self, max_address_param: Option) -> Result<(), BdkError> { self.wallet .lock() .unwrap() - .sync(BdkProgressHolder { progress_update }, max_address_param) + .sync(BdkProgressHolder {}, max_address_param) } fn broadcast<'a>(&self, psbt: &'a PartiallySignedBitcoinTransaction) -> Result {