From: LLFourn <lloyd.fourn@gmail.com>
Date: Sat, 30 Jan 2021 02:12:13 +0000 (+1100)
Subject: Merge branch 'master' into make_txbuilder_take_ref_to_wallet
X-Git-Tag: v0.4.0~23
X-Git-Url: http://internal-gitweb-vhost/%22https:/parse/scripts/database/-script/-debug/struct.ScriptPath.html?a=commitdiff_plain;h=6689384c8aa40958485a35b6f753c446539fb274;p=bdk

Merge branch 'master' into make_txbuilder_take_ref_to_wallet
---

6689384c8aa40958485a35b6f753c446539fb274
diff --cc src/wallet/mod.rs
index bece035e,cabb9b42..19dfff3c
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@@ -57,9 -57,8 +57,9 @@@ pub(crate) mod utils
  pub use utils::IsDust;
  
  use address_validator::AddressValidator;
 +use coin_selection::DefaultCoinSelectionAlgorithm;
- use signer::{Signer, SignerId, SignerOrdering, SignersContainer};
+ use signer::{Signer, SignerOrdering, SignersContainer};
 -use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxBuilderContext};
 +use tx_builder::{BumpFee, CreateTx, FeePolicy, TxBuilder, TxParams};
  use utils::{
      check_nlocktime, check_nsequence_rbf, descriptor_to_pk_ctx, After, Older, SecpCtx,
      DUST_LIMIT_SATOSHI,