Merge #321: Fix tr for each key bug

92e504c Add breaking test case (sanket1729)
8c07952 Fix tr for each key bug (sanket1729)

Pull request description:

  You can re-order commits to see that this is fixed.

ACKs for top commit:
  dr-orlovsky:
    tACK 92e504c
  apoelstra:
    ACK 92e504c

Tree-SHA512: 14f9c045f24ad3147a2220e1a8d5cb3ae5416760993890675d5e1c46101113a991ba43effc11967776c0018f78816d3fb93c8e244e048305213a106c74a85701

Author: sanket1729

src/descriptor/tr.rs

@@ -650,7 +650,7 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Tr<Pk> {
     {
         let script_keys_res = self
             .iter_scripts()
-            .all(|(_d, ms)| ms.for_any_key(&mut pred));
+            .all(|(_d, ms)| ms.for_each_key(&mut pred));
         script_keys_res && pred(ForEach::Key(&self.internal_key))
     }
 }
@@ -745,3 +745,32 @@ where
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ForEachKey;
+
+    #[test]
+    fn test_for_each() {
+        let desc = "tr(acc0, {
+            multi_a(3, acc10, acc11, acc12), {
+              and_v(
+                v:multi_a(2, acc10, acc11, acc12),
+                after(10)
+              ),
+              and_v(
+                v:multi_a(1, acc10, acc11, ac12),
+                after(100)
+              )
+            }
+         })";
+        let desc = desc.replace(&[' ', '\n'][..], "");
+        let tr = Tr::<String>::from_str(&desc).unwrap();
+        // Note the last ac12 only has ac and fails the predicate
+        assert!(!tr.for_each_key(|k| match k {
+            ForEach::Key(k) => k.starts_with("acc"),
+            ForEach::Hash(_h) => unreachable!(),
+        }));
+    }
+}