Skip to content

CI and rustc warning cleanup #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 24, 2020
Merged

CI and rustc warning cleanup #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de1e58e
Run Github Actions on PRs, too
TheBlueMatt Apr 24, 2020
21a9024
Fix step naming in fuzz tests in GitHub Actions
TheBlueMatt Apr 24, 2020
4243b40
Address new rustc warnings.
TheBlueMatt Apr 24, 2020
2e997d7
Silence fuzz build unused import warnings
TheBlueMatt Apr 24, 2020
764e6e7
Disable timeout for full_stack_target runs in CI
TheBlueMatt Apr 24, 2020
ecb9468
Include color when building fuzz targets in CI
TheBlueMatt Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Continuous Integration Checks

on:
push:
on: [push, pull_request]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I had mistakenly assumed push would encompass pull_request..

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I just came back to master to fix that as I realised it was needed for fork PRs. Well done @TheBlueMatt :)


jobs:
build:
Expand Down Expand Up @@ -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 }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

run: cd fuzz && cargo test --verbose --color always
- name: Generate fuzz report
- name: Run fuzzers
run: cd fuzz && ./ci-fuzz.sh
8 changes: 5 additions & 3 deletions fuzz/ci-fuzz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/chanmon_consistency_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/chanmon_deser_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/full_stack_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_accept_channel_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_announcement_signatures_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_channel_announcement_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_channel_reestablish_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_channel_update_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_closing_signed_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_commitment_signed_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_decoded_onion_error_packet_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
7 changes: 4 additions & 3 deletions fuzz/src/bin/msg_error_message_target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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};
Expand Down
Loading