Merge pull request #607 from TheBlueMatt/2020-04-more-cleanups

CI and rustc warning cleanup

Author: TheBlueMatt

.github/workflows/build.yml

@@ -1,7 +1,6 @@
 name: Continuous Integration Checks
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:
@@ -91,7 +90,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install build-essential binutils-dev libunwind-dev
-      - name: Fuzz test on Rust ${{ matrix.TOOLCHAIN }}
+      - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
         run: cd fuzz && cargo test --verbose --color always
-      - name: Generate fuzz report
+      - name: Run fuzzers
         run: cd fuzz && ./ci-fuzz.sh

fuzz/ci-fuzz.sh

@@ -12,20 +12,22 @@ rm *_target.rs
 [ "$(git diff)" != "" ] && exit 1
 popd
 
-cargo install --force honggfuzz
+cargo install --color always --force honggfuzz
 sed -i 's/lto = true//' Cargo.toml
-HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo hfuzz build
+HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo --color always hfuzz build
 for TARGET in src/bin/*.rs; do
 	FILENAME=$(basename $TARGET)
 	FILE="${FILENAME%.*}"
 	HFUZZ_RUN_ARGS="--exit_upon_crash -v -n2"
 	if [ "$FILE" = "chanmon_consistency_target" ]; then
 		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -F 64 -N100000"
+	elif [ "$FILE" = "full_stack_target" ]; then
+		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -t0 -N1000000"
 	else
 		HFUZZ_RUN_ARGS="$HFUZZ_RUN_ARGS -N1000000"
 	fi
 	export HFUZZ_RUN_ARGS
-	HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo hfuzz run $FILE
+	HFUZZ_BUILD_ARGS="--features honggfuzz_fuzz" cargo --color always hfuzz run $FILE
 	if [ -f hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT ]; then
 		cat hfuzz_workspace/$FILE/HONGGFUZZ.REPORT.TXT
 		for CASE in hfuzz_workspace/$FILE/SIG*; do

fuzz/src/bin/chanmon_consistency_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::chanmon_consistency::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	chanmon_consistency_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/chanmon_deser_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::chanmon_deser::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	chanmon_deser_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/full_stack_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::full_stack::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	full_stack_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_accept_channel_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_accept_channel::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_accept_channel_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_announcement_signatures_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_announcement_signatures::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_announcement_signatures_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_channel_announcement_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_channel_announcement::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_channel_announcement_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_channel_reestablish_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_channel_reestablish::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_channel_reestablish_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_channel_update_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_channel_update::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_channel_update_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_closing_signed_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_closing_signed::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_closing_signed_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_commitment_signed_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_commitment_signed::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_commitment_signed_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_decoded_onion_error_packet_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_decoded_onion_error_packet::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_decoded_onion_error_packet_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};

fuzz/src/bin/msg_error_message_target.rs

@@ -6,9 +6,6 @@
 extern crate lightning_fuzz;
 use lightning_fuzz::msg_targets::msg_error_message::*;
 
-use std::fs;
-use std::io::Read;
-
 #[cfg(feature = "afl")]
 #[macro_use] extern crate afl;
 #[cfg(feature = "afl")]
@@ -38,13 +35,17 @@ fuzz_target!(|data: &[u8]| {
 
 #[cfg(feature = "stdin_fuzz")]
 fn main() {
+	use std::io::Read;
+
 	let mut data = Vec::with_capacity(8192);
 	std::io::stdin().read_to_end(&mut data).unwrap();
 	msg_error_message_run(data.as_ptr(), data.len());
 }
 
 #[test]
 fn run_test_cases() {
+	use std::fs;
+	use std::io::Read;
 	use lightning_fuzz::utils::test_logger::StringBuffer;
 
 	use std::sync::{atomic, Arc};