Upgrade AFL to 0.4 with persistent mode fuzzing

[rust-lightning] / fuzz / fuzz_targets / channel_target.rs

diff --git a/fuzz/fuzz_targets/channel_target.rs b/fuzz/fuzz_targets/channel_target.rs
index d5c483f770415047b60cc1888a90c0e7f8c9845a..65f0419f50928d5a22a2867bf1264783285c2ea6 100644 (file)
--- a/fuzz/fuzz_targets/channel_target.rs
+++ b/fuzz/fuzz_targets/channel_target.rs
@@ -107,7 +107,7 @@ pub fn do_test(data: &[u8]) {
                input: &input,
        };
 
-       let logger: Arc<Logger> = Arc::new(test_logger::TestLogger::new());
+       let logger: Arc<Logger> = Arc::new(test_logger::TestLogger{});
 
        macro_rules! get_slice {
                ($len: expr) => {
@@ -199,7 +199,10 @@ pub fn do_test(data: &[u8]) {
        let mut channel = if get_slice!(1)[0] != 0 {
                let chan_value = slice_to_be24(get_slice!(3));
 
-               let mut chan = Channel::new_outbound(&fee_est, chan_keys!(), their_pubkey, chan_value, get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)), Arc::clone(&logger));
+               let mut chan = match Channel::new_outbound(&fee_est, chan_keys!(), their_pubkey, chan_value, slice_to_be24(get_slice!(3)), get_slice!(1)[0] == 0, slice_to_be64(get_slice!(8)), Arc::clone(&logger)) {
+                       Ok(chan) => chan,
+                       Err(_) => return,
+               };
                chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
                let accept_chan = if get_slice!(1)[0] == 0 {
                        decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
@@ -322,11 +325,11 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[cfg(feature = "afl")]
-extern crate afl;
+#[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
 fn main() {
-       afl::read_stdio_bytes(|data| {
-               do_test(&data);
+       fuzz!(|data| {
+               do_test(data);
        });
 }