Fix to at least bitcoin ^0.25.2

And fix the fallout.
2020-11-23 15:06:13 +11:00
parent 196c2f5450
commit d2490d9ce3
3 changed files with 10 additions and 5 deletions
--- a/src/descriptor/policy.rs
+++ b/src/descriptor/policy.rs
@@ -820,9 +820,8 @@ impl ExtractPolicy for Descriptor<DescriptorPublicKey> {
            | Descriptor::Pkh(pubkey)
            | Descriptor::Wpkh(pubkey)
            | Descriptor::ShWpkh(pubkey) => Ok(Some(signature(pubkey, signers, secp))),
-            Descriptor::Bare(inner) | Descriptor::Sh(inner) => {
-                Ok(inner.extract_policy(signers, secp)?)
-            }
+            Descriptor::Bare(inner) => Ok(inner.extract_policy(signers, secp)?),
+            Descriptor::Sh(inner) => Ok(inner.extract_policy(signers, secp)?),
            Descriptor::Wsh(inner) | Descriptor::ShWsh(inner) => {
                Ok(inner.extract_policy(signers, secp)?)
            }