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

diff --cc src/descriptor/mod.rs
index 1fad0bae353c9d0d5045fe8c874636679e8b0ead,ec00133fb308e5a706ab6c3fd67483559795f162..83870135b786765426021f058b971bc15755c4f0
--- 1/src/descriptor/mod.rs
--- 2/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,

diff --cc src/descriptor/policy.rs
Simple merge