frost/bdk-ffi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: add from to cannotconnecterror

Browse Source
This commit is contained in:
Matthew 2024-05-02 10:12:41 -05:00
parent 75d155c67a
commit 9b5b96710e
No known key found for this signature in database
GPG Key ID: 8D4FCD82DD54DDD2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bdk-ffi/src/error.rs
View File

@ -20,6 +20,8 @@ use bdk::miniscript::descriptor::DescriptorKeyParseError as BdkDescriptorKeyPars
use bdk::bitcoin::bip32; use bdk::bitcoin::bip32;
use bdk::chain;
use bdk::wallet::error::CreateTxError as BdkCreateTxError; use bdk::wallet::error::CreateTxError as BdkCreateTxError;
use std::convert::TryInto; use std::convert::TryInto;
@ -547,6 +549,14 @@ impl From<BdkCalculateFeeError> for CalculateFeeError {
} }
} }
impl From<chain::local_chain::CannotConnectError> for CannotConnectError {
fn from(error: chain::local_chain::CannotConnectError) -> Self {
CannotConnectError::Include {
height: error.try_include_height,
}
}
}
impl From<BdkCreateTxError<std::io::Error>> for CreateTxError { impl From<BdkCreateTxError<std::io::Error>> for CreateTxError {
fn from(error: BdkCreateTxError<std::io::Error>) -> Self { fn from(error: BdkCreateTxError<std::io::Error>) -> Self {
match error { match error {

4
bdk-ffi/src/wallet.rs
View File

@ -59,9 +59,7 @@ impl Wallet {
pub fn apply_update(&self, update: Arc<Update>) -> Result<(), CannotConnectError> { pub fn apply_update(&self, update: Arc<Update>) -> Result<(), CannotConnectError> {
self.get_wallet() self.get_wallet()
.apply_update(update.0.clone()) .apply_update(update.0.clone())
.map_err(|e| CannotConnectError::Include { .map_err(CannotConnectError::from)
height: e.try_include_height,
})
} }
// TODO: This is the fallible version of get_internal_address; should I rename it to get_internal_address? // TODO: This is the fallible version of get_internal_address; should I rename it to get_internal_address?