From d36bafee761177556da1ac6b874839728be7c66d Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 16 Nov 2023 09:16:02 -0600 Subject: [PATCH] fix(wallet): rebase error --- crates/bdk/src/wallet/mod.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/bdk/src/wallet/mod.rs b/crates/bdk/src/wallet/mod.rs index a27f14885e..f3d7a89678 100644 --- a/crates/bdk/src/wallet/mod.rs +++ b/crates/bdk/src/wallet/mod.rs @@ -426,9 +426,6 @@ pub enum InsertTxError { }, } -#[cfg(feature = "std")] -impl std::error::Error for NewError

{} - impl Wallet { /// Initialize an empty [`Wallet`]. pub fn new( @@ -1806,7 +1803,7 @@ impl Wallet { psbt: &mut psbt::PartiallySignedTransaction, sign_options: SignOptions, ) -> Result { - let chain_tip = self.chain.tip().map(|cp| cp.block_id()).unwrap_or_default(); + let chain_tip = self.chain.tip().block_id(); let tx = &psbt.unsigned_tx; let mut finished = true;