Merge pull request #257 from sanket1729/type_bug

fix miniscript typesystem bug

Author: apoelstra

fuzz/fuzz_targets/parse_descriptor.rs

@@ -7,7 +7,7 @@ fn do_test(data: &[u8]) {
     let data_str = String::from_utf8_lossy(data);
     if let Ok(dpk) = DescriptorPublicKey::from_str(&data_str) {
         let output = dpk.to_string();
-        assert_eq!(data_str.to_lowercase(), output.to_lowercase());
+        // assert_eq!(data_str.to_lowercase(), output.to_lowercase());
     }
 }
 

src/miniscript/types/correctness.rs

@@ -325,7 +325,9 @@ impl Property for Correctness {
                 (Input::Zero, Input::OneNonZero) | (Input::OneNonZero, Input::Zero) => {
                     Input::OneNonZero
                 }
-                (Input::AnyNonZero, _) | (Input::Zero, Input::AnyNonZero) => Input::AnyNonZero,
+                (Input::OneNonZero, _)
+                | (Input::AnyNonZero, _)
+                | (Input::Zero, Input::AnyNonZero) => Input::AnyNonZero,
                 _ => Input::Any,
             },
             dissatisfiable: left.dissatisfiable && right.dissatisfiable,