Skip to content

Commit d36bafe

Browse files
committed
fix(wallet): rebase error
1 parent 55b6b45 commit d36bafe

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

crates/bdk/src/wallet/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,6 @@ pub enum InsertTxError {
426426
},
427427
}
428428

429-
#[cfg(feature = "std")]
430-
impl<P: core::fmt::Display + core::fmt::Debug> std::error::Error for NewError<P> {}
431-
432429
impl<D> Wallet<D> {
433430
/// Initialize an empty [`Wallet`].
434431
pub fn new<E: IntoWalletDescriptor>(
@@ -1806,7 +1803,7 @@ impl<D> Wallet<D> {
18061803
psbt: &mut psbt::PartiallySignedTransaction,
18071804
sign_options: SignOptions,
18081805
) -> Result<bool, SignerError> {
1809-
let chain_tip = self.chain.tip().map(|cp| cp.block_id()).unwrap_or_default();
1806+
let chain_tip = self.chain.tip().block_id();
18101807

18111808
let tx = &psbt.unsigned_tx;
18121809
let mut finished = true;

0 commit comments

Comments
 (0)