From 9501ecce495de2991db68923b6b1fcc69c78bac9 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 22 Nov 2019 15:40:58 -0500 Subject: [PATCH] Move fuzz to top level. --- .travis.yml | 2 +- {lightning/fuzz => fuzz}/.gitignore | 0 {lightning/fuzz => fuzz}/Cargo.toml | 2 +- {lightning/fuzz => fuzz}/fuzz_targets/chanmon_deser_target.rs | 0 .../fuzz => fuzz}/fuzz_targets/chanmon_fail_consistency.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/full_stack_target.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/gen_target.sh | 0 .../fuzz_targets/msg_targets/msg_accept_channel_target.rs | 0 .../msg_targets/msg_announcement_signatures_target.rs | 0 .../fuzz_targets/msg_targets/msg_channel_announcement_target.rs | 0 .../fuzz_targets/msg_targets/msg_channel_reestablish_target.rs | 0 .../fuzz_targets/msg_targets/msg_channel_update_target.rs | 0 .../fuzz_targets/msg_targets/msg_closing_signed_target.rs | 0 .../fuzz_targets/msg_targets/msg_commitment_signed_target.rs | 0 .../msg_targets/msg_decoded_onion_error_packet_target.rs | 0 .../fuzz_targets/msg_targets/msg_error_message_target.rs | 0 .../fuzz_targets/msg_targets/msg_funding_created_target.rs | 0 .../fuzz_targets/msg_targets/msg_funding_locked_target.rs | 0 .../fuzz_targets/msg_targets/msg_funding_signed_target.rs | 0 .../fuzz => fuzz}/fuzz_targets/msg_targets/msg_init_target.rs | 0 .../fuzz_targets/msg_targets/msg_node_announcement_target.rs | 0 .../fuzz_targets/msg_targets/msg_onion_hop_data_target.rs | 0 .../fuzz_targets/msg_targets/msg_open_channel_target.rs | 0 .../fuzz => fuzz}/fuzz_targets/msg_targets/msg_ping_target.rs | 0 .../fuzz => fuzz}/fuzz_targets/msg_targets/msg_pong_target.rs | 0 .../fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs | 0 .../fuzz_targets/msg_targets/msg_shutdown_target.rs | 0 .../fuzz_targets/msg_targets/msg_target_template.txt | 0 .../fuzz_targets/msg_targets/msg_update_add_htlc_target.rs | 0 .../fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs | 0 .../msg_targets/msg_update_fail_malformed_htlc_target.rs | 0 .../fuzz_targets/msg_targets/msg_update_fee_target.rs | 0 .../fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/utils.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/peer_crypt_target.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/router_target.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/utils/mod.rs | 0 {lightning/fuzz => fuzz}/fuzz_targets/utils/test_logger.rs | 0 {lightning/fuzz => fuzz}/travis-fuzz.sh | 0 39 files changed, 2 insertions(+), 2 deletions(-) rename {lightning/fuzz => fuzz}/.gitignore (100%) rename {lightning/fuzz => fuzz}/Cargo.toml (98%) rename {lightning/fuzz => fuzz}/fuzz_targets/chanmon_deser_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/chanmon_fail_consistency.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/full_stack_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/gen_target.sh (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_accept_channel_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_channel_announcement_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_channel_update_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_closing_signed_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_commitment_signed_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_error_message_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_funding_created_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_funding_locked_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_funding_signed_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_init_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_node_announcement_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_open_channel_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_ping_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_pong_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_shutdown_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_target_template.txt (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_update_fee_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/msg_targets/utils.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/peer_crypt_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/router_target.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/utils/mod.rs (100%) rename {lightning/fuzz => fuzz}/fuzz_targets/utils/test_logger.rs (100%) rename {lightning/fuzz => fuzz}/travis-fuzz.sh (100%) diff --git a/.travis.yml b/.travis.yml index 9c9257855..308c8d634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: # Test lightning workspace for 1.22.0 - if [ "$(rustup show | grep default | grep 1.22.0)" != "" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose -p lightning; fi # Run lightning workspace fuzz tests for Rust 1.34.2 - - if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then cd lightning/fuzz && cargo test --verbose && ./travis-fuzz.sh; fi + - if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then cd fuzz && cargo test --verbose && ./travis-fuzz.sh; fi - if [ "$(rustup show | grep default | grep stable)" != "" ]; then wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz && diff --git a/lightning/fuzz/.gitignore b/fuzz/.gitignore similarity index 100% rename from lightning/fuzz/.gitignore rename to fuzz/.gitignore diff --git a/lightning/fuzz/Cargo.toml b/fuzz/Cargo.toml similarity index 98% rename from lightning/fuzz/Cargo.toml rename to fuzz/Cargo.toml index 19d832e87..96699a7db 100644 --- a/lightning/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -17,7 +17,7 @@ libfuzzer_fuzz = ["libfuzzer-sys"] [dependencies] afl = { version = "0.4", optional = true } -lightning = { path = "..", features = ["fuzztarget"] } +lightning = { path = "../lightning", features = ["fuzztarget"] } bitcoin = { version = "0.20", features = ["fuzztarget"] } bitcoin_hashes = { version = "0.7", features = ["fuzztarget"] } hex = "0.3" diff --git a/lightning/fuzz/fuzz_targets/chanmon_deser_target.rs b/fuzz/fuzz_targets/chanmon_deser_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/chanmon_deser_target.rs rename to fuzz/fuzz_targets/chanmon_deser_target.rs diff --git a/lightning/fuzz/fuzz_targets/chanmon_fail_consistency.rs b/fuzz/fuzz_targets/chanmon_fail_consistency.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/chanmon_fail_consistency.rs rename to fuzz/fuzz_targets/chanmon_fail_consistency.rs diff --git a/lightning/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/full_stack_target.rs rename to fuzz/fuzz_targets/full_stack_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/gen_target.sh b/fuzz/fuzz_targets/msg_targets/gen_target.sh similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/gen_target.sh rename to fuzz/fuzz_targets/msg_targets/gen_target.sh diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs b/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs b/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs b/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs b/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs b/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs b/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs b/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs b/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs b/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs b/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs b/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs b/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_init_target.rs b/fuzz/fuzz_targets/msg_targets/msg_init_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_init_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_init_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs b/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs b/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs b/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs b/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_ping_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs b/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_pong_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs b/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs b/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_target_template.txt b/fuzz/fuzz_targets/msg_targets/msg_target_template.txt similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_target_template.txt rename to fuzz/fuzz_targets/msg_targets/msg_target_template.txt diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs b/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs b/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs b/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs b/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs b/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs rename to fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs diff --git a/lightning/fuzz/fuzz_targets/msg_targets/utils.rs b/fuzz/fuzz_targets/msg_targets/utils.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/msg_targets/utils.rs rename to fuzz/fuzz_targets/msg_targets/utils.rs diff --git a/lightning/fuzz/fuzz_targets/peer_crypt_target.rs b/fuzz/fuzz_targets/peer_crypt_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/peer_crypt_target.rs rename to fuzz/fuzz_targets/peer_crypt_target.rs diff --git a/lightning/fuzz/fuzz_targets/router_target.rs b/fuzz/fuzz_targets/router_target.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/router_target.rs rename to fuzz/fuzz_targets/router_target.rs diff --git a/lightning/fuzz/fuzz_targets/utils/mod.rs b/fuzz/fuzz_targets/utils/mod.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/utils/mod.rs rename to fuzz/fuzz_targets/utils/mod.rs diff --git a/lightning/fuzz/fuzz_targets/utils/test_logger.rs b/fuzz/fuzz_targets/utils/test_logger.rs similarity index 100% rename from lightning/fuzz/fuzz_targets/utils/test_logger.rs rename to fuzz/fuzz_targets/utils/test_logger.rs diff --git a/lightning/fuzz/travis-fuzz.sh b/fuzz/travis-fuzz.sh similarity index 100% rename from lightning/fuzz/travis-fuzz.sh rename to fuzz/travis-fuzz.sh -- 2.39.5