From: Alekos Filini <alekos.filini@gmail.com>
Date: Mon, 14 Dec 2020 10:27:51 +0000 (+0100)
Subject: Merge commit 'refs/pull/221/head' of github.com:bitcoindevkit/bdk
X-Git-Tag: v0.2.0~24
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/enum.HexToArrayError.html?a=commitdiff_plain;h=c83cec377755486995ec2f1725f62033da0285de;p=bdk

Merge commit 'refs/pull/221/head' of github.com:bitcoindevkit/bdk
---

c83cec377755486995ec2f1725f62033da0285de
diff --cc src/descriptor/mod.rs
index 1fad0bae,ec00133f..83870135
--- a/src/descriptor/mod.rs
+++ b/src/descriptor/mod.rs
@@@ -65,11 -62,11 +63,11 @@@ pub type ExtendedDescriptor = Descripto
  ///
  /// [`psbt::Input`]: bitcoin::util::psbt::Input
  /// [`psbt::Output`]: bitcoin::util::psbt::Output
 -pub type HDKeyPaths = BTreeMap<PublicKey, (Fingerprint, DerivationPath)>;
 +pub type HDKeyPaths = BTreeMap<PublicKey, KeySource>;
  
- #[allow(missing_docs)] // TODO add missing docs and remove this allow
  /// Trait for types which can be converted into an [`ExtendedDescriptor`] and a [`KeyMap`] usable by a wallet in a specific [`Network`]
  pub trait ToWalletDescriptor {
+     /// Convert to wallet descriptor
      fn to_wallet_descriptor(
          self,
          network: Network,