Skip to content

Commit fc9a4c2

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #1780 from wpaulino/rust-edition-2018
2 parents ad82c9e + f4f1093 commit fc9a4c2

File tree

109 files changed

+959
-954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+959
-954
lines changed

‎fuzz/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "lightning-fuzz"
33
version = "0.0.1"
44
authors = ["Automatically generated"]
55
publish = false
6+
edition = "2018"
67
# Because the function is unused it gets dropped before we link lightning, so
78
# we have to duplicate build.rs here. Note that this is only required for
89
# fuzzing mode.

‎fuzz/src/chanmon_consistency.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ use lightning::util::events::MessageSendEventsProvider;
5151
use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
5252
use lightning::routing::router::{Route, RouteHop};
5353

54-
use utils::test_logger::{self, Output};
55-
use utils::test_persister::TestPersister;
54+
use crate::utils::test_logger::{self, Output};
55+
use crate::utils::test_persister::TestPersister;
5656

5757
use bitcoin::secp256k1::{PublicKey, SecretKey, Scalar};
5858
use bitcoin::secp256k1::ecdh::SharedSecret;

‎fuzz/src/chanmon_deser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use lightning::util::enforcing_trait_impls::EnforcingSigner;
88
use lightning::util::ser::{ReadableArgs, Writer, Writeable};
99
use lightning::util::test_utils::OnlyReadsKeysInterface;
1010

11-
use utils::test_logger;
11+
use crate::utils::test_logger;
1212

1313
use std::io::Cursor;
1414

‎fuzz/src/full_stack.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ use lightning::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
4949
use lightning::util::logger::Logger;
5050
use lightning::util::ser::ReadableArgs;
5151

52-
use utils::test_logger;
53-
use utils::test_persister::TestPersister;
52+
use crate::utils::test_logger;
53+
use crate::utils::test_persister::TestPersister;
5454

5555
use bitcoin::secp256k1::{PublicKey, SecretKey, Scalar};
5656
use bitcoin::secp256k1::ecdh::SharedSecret;

‎fuzz/src/msg_targets/msg_accept_channel.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_accept_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_announcement_signatures.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_announcement_signatures_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_channel_announcement.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_announcement_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_channel_details.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_details_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_channel_ready.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_ready_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_channel_reestablish.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_reestablish_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_channel_update.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_channel_update_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_closing_signed.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_closing_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_commitment_signed.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_commitment_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_decoded_onion_error_packet_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_error_message.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_error_message_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_funding_created.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_funding_created_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_funding_signed.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_funding_signed_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_gossip_timestamp_filter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_gossip_timestamp_filter_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_init.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_init_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_node_announcement.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_node_announcement_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_onion_hop_data.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_onion_hop_data_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_open_channel.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_open_channel_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_ping.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_ping_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_pong.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_pong_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_query_channel_range.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_query_channel_range_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_query_short_channel_ids.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_query_short_channel_ids_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_reply_channel_range.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_reply_channel_range_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_reply_short_channel_ids_end.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_reply_short_channel_ids_end_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_revoke_and_ack.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_revoke_and_ack_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_shutdown.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_shutdown_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_target_template.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn TARGET_NAME_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_update_add_htlc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_update_add_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_update_fail_htlc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_update_fail_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_update_fail_malformed_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_update_fee.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_update_fee_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

‎fuzz/src/msg_targets/msg_update_fulfill_htlc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// This file is auto-generated by gen_target.sh based on msg_target_template.txt
1111
// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
1212

13-
use msg_targets::utils::VecWriter;
14-
use utils::test_logger;
13+
use crate::msg_targets::utils::VecWriter;
14+
use crate::utils::test_logger;
1515

1616
#[inline]
1717
pub fn msg_update_fulfill_htlc_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

0 commit comments

Comments
 (0)