Implement Satisfier for map (hash, tapleafhash) to (key, taproot sig)

Add a macro and call it to duplicate the current implementation of
`Satisfier<Pk> for HashMap<(hash160::Hash, TapLeafHash), (Pk,
bitcoin::taproot::Signature)> for a `BTreeMap`.

Author: tcharding

src/miniscript/satisfy.rs

@@ -228,29 +228,37 @@ macro_rules! impl_satisfier_for_map_hash_to_key_ecdsa_sig {
 }
 #[rustfmt::skip]
 impl_satisfier_for_map_hash_to_key_ecdsa_sig!(BTreeMap, #[cfg(feature = "std")] HashMap);
+macro_rules! impl_satisfier_for_map_hash_tapleafhash_to_key_taproot_sig {
+    ($($(#[cfg($attr:meta)])* $map:ident),*) => {
+        $(
+            $(#[cfg($attr)])*
+            impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk>
+                for $map<(hash160::Hash, TapLeafHash), (Pk, bitcoin::taproot::Signature)>
+            where
+                Pk: MiniscriptKey + ToPublicKey,
+            {
+                fn lookup_tap_leaf_script_sig(
+                    &self,
+                    key: &Pk,
+                    h: &TapLeafHash,
+                ) -> Option<bitcoin::taproot::Signature> {
+                    self.get(&(key.to_pubkeyhash(SigType::Schnorr), *h))
+                        .map(|x| x.1)
+                }
 
-impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk>
-    for HashMap<(hash160::Hash, TapLeafHash), (Pk, bitcoin::taproot::Signature)>
-where
-    Pk: MiniscriptKey + ToPublicKey,
-{
-    fn lookup_tap_leaf_script_sig(
-        &self,
-        key: &Pk,
-        h: &TapLeafHash,
-    ) -> Option<bitcoin::taproot::Signature> {
-        self.get(&(key.to_pubkeyhash(SigType::Schnorr), *h))
-            .map(|x| x.1)
-    }
-
-    fn lookup_raw_pkh_tap_leaf_script_sig(
-        &self,
-        pk_hash: &(hash160::Hash, TapLeafHash),
-    ) -> Option<(XOnlyPublicKey, bitcoin::taproot::Signature)> {
-        self.get(pk_hash)
-            .map(|&(ref pk, sig)| (pk.to_x_only_pubkey(), sig))
+                fn lookup_raw_pkh_tap_leaf_script_sig(
+                    &self,
+                    pk_hash: &(hash160::Hash, TapLeafHash),
+                ) -> Option<(XOnlyPublicKey, bitcoin::taproot::Signature)> {
+                    self.get(pk_hash)
+                        .map(|&(ref pk, sig)| (pk.to_x_only_pubkey(), sig))
+                }
+            }
+        )*
     }
 }
+#[rustfmt::skip]
+impl_satisfier_for_map_hash_tapleafhash_to_key_taproot_sig!(BTreeMap, #[cfg(feature = "std")] HashMap);
 
 impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'a S {
     fn lookup_ecdsa_sig(&self, p: &Pk) -> Option<bitcoin::ecdsa::Signature> {