fuzz: remove afl support, run clippy and fmt on fuzz targets

Author: apoelstra

fuzz/fuzz_targets/compile_descriptor.rs

@@ -1,7 +1,6 @@
-extern crate miniscript;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::{policy, Miniscript, Segwitv0};
 use policy::Liftable;
 
@@ -14,10 +13,7 @@ fn do_test(data: &[u8]) {
         // Compile
         if let Ok(desc) = pol.compile::<Segwitv0>() {
             // Lift
-            assert_eq!(
-                desc.clone().lift().unwrap().sorted(),
-                pol.clone().lift().unwrap().sorted()
-            );
+            assert_eq!(desc.lift().unwrap().sorted(), pol.lift().unwrap().sorted());
             // Try to roundtrip the output of the compiler
             let output = desc.to_string();
             if let Ok(desc) = Script::from_str(&output) {
@@ -30,19 +26,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {

fuzz/fuzz_targets/parse_descriptor.rs

@@ -1,30 +1,16 @@
-extern crate miniscript;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::DescriptorPublicKey;
 
 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());
+        let _output = dpk.to_string();
+        // assert_eq!(data_str.to_lowercase(), _output.to_lowercase());
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {

fuzz/fuzz_targets/parse_descriptor_secret.rs

@@ -1,7 +1,6 @@
-extern crate miniscript;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::descriptor::DescriptorSecretKey;
 
 fn do_test(data: &[u8]) {
@@ -12,19 +11,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {

fuzz/fuzz_targets/roundtrip_concrete.rs

@@ -1,7 +1,6 @@
-extern crate miniscript;
-extern crate regex;
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::policy;
 use regex::Regex;
 
@@ -19,19 +18,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {
@@ -47,9 +33,9 @@ mod tests {
         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',
+                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 {

fuzz/fuzz_targets/roundtrip_descriptor.rs

@@ -1,10 +1,7 @@
-extern crate miniscript;
-extern crate regex;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::Descriptor;
-use regex::Regex;
 
 fn do_test(data: &[u8]) {
     let s = String::from_utf8_lossy(data);
@@ -16,19 +13,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {

fuzz/fuzz_targets/roundtrip_miniscript_script.rs

@@ -1,32 +1,18 @@
-extern crate miniscript;
-
+use honggfuzz::fuzz;
 use miniscript::bitcoin::blockdata::script;
 use miniscript::{Miniscript, Segwitv0};
 
 fn do_test(data: &[u8]) {
     // Try round-tripping as a script
     let script = script::Script::from_bytes(data);
 
-    if let Ok(pt) = Miniscript::<miniscript::bitcoin::PublicKey, Segwitv0>::parse(&script) {
+    if let Ok(pt) = Miniscript::<miniscript::bitcoin::PublicKey, Segwitv0>::parse(script) {
         let output = pt.encode();
         assert_eq!(pt.script_size(), output.len());
         assert_eq!(&output, script);
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {
@@ -42,9 +28,9 @@ mod tests {
         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',
+                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 {

fuzz/fuzz_targets/roundtrip_miniscript_str.rs

@@ -1,10 +1,7 @@
-extern crate miniscript;
-extern crate regex;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::{Miniscript, Segwitv0};
-use regex::Regex;
 
 fn do_test(data: &[u8]) {
     let s = String::from_utf8_lossy(data);
@@ -16,19 +13,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {
@@ -44,9 +28,9 @@ mod tests {
         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',
+                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 {

fuzz/fuzz_targets/roundtrip_semantic.rs

@@ -1,7 +1,6 @@
-extern crate miniscript;
-
 use std::str::FromStr;
 
+use honggfuzz::fuzz;
 use miniscript::policy;
 
 type Policy = policy::Semantic<String>;
@@ -14,19 +13,6 @@ fn do_test(data: &[u8]) {
     }
 }
 
-#[cfg(feature = "afl")]
-extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
-    afl::read_stdio_bytes(|data| {
-        do_test(&data);
-    });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use]
-extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
 fn main() {
     loop {
         fuzz!(|data| {