Fix for: Tests in fuzz directory [issue #91]

fuzz/fuzz_targets/roundtrip_concrete.rs

@@ -1,6 +1,8 @@
 
 extern crate miniscript;
 
+#[path = "../src/util.rs"] mod util;
+
 use std::str::FromStr;
 use miniscript::{policy, DummyKey};
 
@@ -36,22 +38,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
+    use util::extend_vec_from_hex;
 
     #[test]
     fn duplicate_crash() {

fuzz/fuzz_targets/roundtrip_descriptor.rs

@@ -1,8 +1,9 @@
 
 extern crate miniscript;
 
-use miniscript::{Descriptor, DummyKey};
+#[path = "../src/util.rs"] mod util;
 
+use miniscript::{Descriptor, DummyKey};
 use std::str::FromStr;
 
 fn do_test(data: &[u8]) {
@@ -36,22 +37,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
+    use util::extend_vec_from_hex;
 
     #[test]
     fn duplicate_crash() {

fuzz/fuzz_targets/roundtrip_miniscript_script.rs

@@ -1,6 +1,8 @@
 
 extern crate miniscript;
 
+#[path = "../src/util.rs"] mod util;
+
 use miniscript::Miniscript;
 use miniscript::bitcoin::blockdata::script;
 
@@ -37,22 +39,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
+    use util::extend_vec_from_hex;
 
     #[test]
     fn duplicate_crash() {

fuzz/fuzz_targets/roundtrip_miniscript_str.rs

@@ -1,8 +1,9 @@
 
 extern crate miniscript;
 
-use std::str::FromStr;
+#[path = "../src/util.rs"] mod util;
 
+use std::str::FromStr;
 use miniscript::{DummyKey};
 use miniscript::Miniscript;
 
@@ -36,22 +37,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
+    use util::extend_vec_from_hex;
 
     #[test]
     fn duplicate_crash() {

fuzz/fuzz_targets/roundtrip_policy.rs

@@ -1,6 +1,8 @@
 
 extern crate miniscript;
 
+#[path = "../src/util.rs"] mod util;
+
 use std::str::FromStr;
 use miniscript::{policy, DummyKey};
 
@@ -41,34 +43,12 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
+    use util::extend_vec_from_hex;
 
     #[test]
     fn duplicate_crash() {
         let mut a = Vec::new();
         extend_vec_from_hex("00", &mut a);
         super::do_test(&a);
     }
-
-    #[test]
-    fn duplicate_crash_2() {
-        let mut a = Vec::new();
-        extend_vec_from_hex("746872657368", &mut a); // thresh
-        super::do_test(&a);
-    }
 }

fuzz/fuzz_targets/roundtrip_semantic.rs

@@ -1,6 +1,8 @@
 
 extern crate miniscript;
 
+#[path = "../src/util.rs"] mod util;
+
 use std::str::FromStr;
 use miniscript::{policy, DummyKey};
 
@@ -36,27 +38,12 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-    fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
-        let mut b = 0;
-        for (idx, c) in hex.as_bytes().iter().enumerate() {
-            b <<= 4;
-            match *c {
-                b'A'...b'F' => b |= c - b'A' + 10,
-                b'a'...b'f' => b |= c - b'a' + 10,
-                b'0'...b'9' => b |= c - b'0',
-                _ => panic!("Bad hex"),
-            }
-            if (idx & 1) == 1 {
-                out.push(b);
-                b = 0;
-            }
-        }
-    }
-
+    use util::extend_vec_from_hex;
+
     #[test]
     fn duplicate_crash() {
         let mut a = Vec::new();
         extend_vec_from_hex("048531e80700ae6400670000af5168", &mut a);
         super::do_test(&a);
     }
-}
+}

fuzz/src/util.rs

@@ -0,0 +1,17 @@
+#[cfg(test)]
+pub fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
+    let mut b = 0;
+    for (idx, c) in hex.as_bytes().iter().enumerate() {
+        b <<= 4;
+        match *c {
+            b'A'...b'F' => b |= c - b'A' + 10,
+            b'a'...b'f' => b |= c - b'a' + 10,
+            b'0'...b'9' => b |= c - b'0',
+            _ => panic!("Bad hex"),
+        }
+        if (idx & 1) == 1 {
+            out.push(b);
+            b = 0;
+        }
+    }
+}

src/policy/semantic.rs

@@ -485,6 +485,11 @@ mod tests {
              )"
         )
         .is_ok());
+
+        assert_eq!(
+            StringPolicy::from_str("thresh").unwrap_err().to_string(),
+            "unexpected «thresh without args»"
+        );
     }
 
     #[test]