From aadc622006ceab4939bacfb6f02e7a0d0d0346a9 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 17 Jan 2023 15:47:48 -0500 Subject: [PATCH] Refactor: Fix up imports --- bdk-ffi/src/blockchain.rs | 9 ++++++++- bdk-ffi/src/lib.rs | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bdk-ffi/src/blockchain.rs b/bdk-ffi/src/blockchain.rs index cc107f7..2d8e9f5 100644 --- a/bdk-ffi/src/blockchain.rs +++ b/bdk-ffi/src/blockchain.rs @@ -11,9 +11,10 @@ use bdk::blockchain::{ electrum::ElectrumBlockchainConfig, esplora::EsploraBlockchainConfig, rpc::RpcConfig as BdkRpcConfig, ConfigurableBlockchain, }; +use bdk::FeeRate; use std::convert::{From, TryFrom}; use std::path::PathBuf; -use std::sync::{Mutex, MutexGuard}; +use std::sync::{Arc, Mutex, MutexGuard}; pub(crate) struct Blockchain { blockchain_mutex: Mutex, @@ -64,6 +65,12 @@ impl Blockchain { self.get_blockchain().broadcast(&tx) } + pub(crate) fn estimate_fee(&self, target: u64) -> Result, BdkError> { + let result: Result = + self.get_blockchain().estimate_fee(target as usize); + result.map(Arc::new) + } + pub(crate) fn get_height(&self) -> Result { self.get_blockchain().get_height() } diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs index bf030b6..5363120 100644 --- a/bdk-ffi/src/lib.rs +++ b/bdk-ffi/src/lib.rs @@ -24,9 +24,8 @@ use bdk::wallet::AddressInfo as BdkAddressInfo; use bdk::{Balance as BdkBalance, BlockTime, Error as BdkError, FeeRate, KeychainKind}; use std::convert::From; use std::fmt; -use std::ops::Deref; use std::str::FromStr; -use std::sync::{Arc, Mutex}; +use std::sync::Arc; uniffi_macros::include_scaffolding!("bdk");