diff --git a/.travis.yml b/.travis.yml index ef0aa839cf5..9c9257855cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,22 +11,28 @@ before_install: - sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev script: - - RUSTFLAGS="-C link-dead-code" cargo build --verbose - - rm -f target/debug/lightning-* # Make sure we drop old test binaries - - RUSTFLAGS="-C link-dead-code" cargo test --verbose - - 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 cd net-tokio && cargo build --verbose && cd ..; fi - - if [ "$(rustup show | grep default | grep stable)" != "" ]; then - wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && - tar xzf master.tar.gz && - cd kcov-master && - mkdir build && - cd build && - cmake .. && - make && - make install DESTDIR=../../kcov-build && - cd ../.. && - rm -rf kcov-master && - for file in target/debug/lightning-*; do [ -x "${file}" ] || continue; mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done && - bash <(curl -s https://codecov.io/bash) && - echo "Uploaded code coverage"; fi + # Build workspaces with Rust stable, beta, and 1.34.0 + - if [ "$(rustup show | grep default | grep 1.22.0)" == "" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose; fi + # Build lightning workspace with Rust 1.22.0 + - if [ "$(rustup show | grep default | grep 1.22.0)" != "" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose -p lightning; fi + - rm -f target/debug/lightning-* # Make sure we drop old test binaries + # Test workspaces for Rust stable, beta, and 1.34.2 + - if [ "$(rustup show | grep default | grep 1.22.0)" == "" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose; fi + # 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 stable)" != "" ]; then + wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && + tar xzf master.tar.gz && + cd kcov-master && + mkdir build && + cd build && + cmake .. && + make && + make install DESTDIR=../../kcov-build && + cd ../.. && + rm -rf kcov-master && + for file in target/debug/lightning-*; do [ -x "${file}" ] || continue; mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done && + bash <(curl -s https://codecov.io/bash) && + echo "Uploaded code coverage"; fi diff --git a/Cargo.toml b/Cargo.toml index 004e6d25bbb..6ec1776c933 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,38 +1,6 @@ -[package] -name = "lightning" -version = "0.0.9" -authors = ["Matt Corallo"] -license = "Apache-2.0" -repository = "https://github.com/rust-bitcoin/rust-lightning/" -description = """ -A Bitcoin Lightning library in Rust. -Does most of the hard work, without implying a specific runtime, requiring clients implement basic network logic, chain interactions and disk storage. -Still missing tons of error-handling. See GitHub issues for suggested projects if you want to contribute. Don't have to bother telling you not to use this for anything serious, because you'd have to build a client around it to even try. -""" +[workspace] -[features] -# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks. -non_bitcoin_chain_hash_routing = [] -fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget", "bitcoin_hashes/fuzztarget"] -# Unlog messages superior at targeted level. -max_level_off = [] -max_level_error = [] -max_level_warn = [] -max_level_info = [] -max_level_debug = [] - -[dependencies] -bitcoin = "0.20" -bitcoin_hashes = "0.7" -secp256k1 = "0.15" - -[dev-dependencies.bitcoin] -version = "0.20" -features = ["bitcoinconsensus"] - -[dev-dependencies] -hex = "0.3" -rand = "0.4" - -[profile.dev] -opt-level = 1 +members = [ + "lightning", + "lightning-net-tokio", +] diff --git a/net-tokio/Cargo.toml b/lightning-net-tokio/Cargo.toml similarity index 90% rename from net-tokio/Cargo.toml rename to lightning-net-tokio/Cargo.toml index 6b8d42c4728..f6fa03bdf24 100644 --- a/net-tokio/Cargo.toml +++ b/lightning-net-tokio/Cargo.toml @@ -11,7 +11,7 @@ For Rust-Lightning clients which wish to make direct connections to Lightning P2 [dependencies] bitcoin = "0.20" bitcoin_hashes = "0.7" -lightning = { version = "0.0.9", path = "../" } +lightning = { version = "0.0.9", path = "../lightning" } secp256k1 = "0.15" tokio-codec = "0.1" futures = "0.1" diff --git a/net-tokio/src/lib.rs b/lightning-net-tokio/src/lib.rs similarity index 100% rename from net-tokio/src/lib.rs rename to lightning-net-tokio/src/lib.rs diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml new file mode 100644 index 00000000000..004e6d25bbb --- /dev/null +++ b/lightning/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "lightning" +version = "0.0.9" +authors = ["Matt Corallo"] +license = "Apache-2.0" +repository = "https://github.com/rust-bitcoin/rust-lightning/" +description = """ +A Bitcoin Lightning library in Rust. +Does most of the hard work, without implying a specific runtime, requiring clients implement basic network logic, chain interactions and disk storage. +Still missing tons of error-handling. See GitHub issues for suggested projects if you want to contribute. Don't have to bother telling you not to use this for anything serious, because you'd have to build a client around it to even try. +""" + +[features] +# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks. +non_bitcoin_chain_hash_routing = [] +fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget", "bitcoin_hashes/fuzztarget"] +# Unlog messages superior at targeted level. +max_level_off = [] +max_level_error = [] +max_level_warn = [] +max_level_info = [] +max_level_debug = [] + +[dependencies] +bitcoin = "0.20" +bitcoin_hashes = "0.7" +secp256k1 = "0.15" + +[dev-dependencies.bitcoin] +version = "0.20" +features = ["bitcoinconsensus"] + +[dev-dependencies] +hex = "0.3" +rand = "0.4" + +[profile.dev] +opt-level = 1 diff --git a/fuzz/.gitignore b/lightning/fuzz/.gitignore similarity index 100% rename from fuzz/.gitignore rename to lightning/fuzz/.gitignore diff --git a/fuzz/Cargo.toml b/lightning/fuzz/Cargo.toml similarity index 100% rename from fuzz/Cargo.toml rename to lightning/fuzz/Cargo.toml diff --git a/fuzz/fuzz_targets/chanmon_deser_target.rs b/lightning/fuzz/fuzz_targets/chanmon_deser_target.rs similarity index 100% rename from fuzz/fuzz_targets/chanmon_deser_target.rs rename to lightning/fuzz/fuzz_targets/chanmon_deser_target.rs diff --git a/fuzz/fuzz_targets/chanmon_fail_consistency.rs b/lightning/fuzz/fuzz_targets/chanmon_fail_consistency.rs similarity index 100% rename from fuzz/fuzz_targets/chanmon_fail_consistency.rs rename to lightning/fuzz/fuzz_targets/chanmon_fail_consistency.rs diff --git a/fuzz/fuzz_targets/full_stack_target.rs b/lightning/fuzz/fuzz_targets/full_stack_target.rs similarity index 100% rename from fuzz/fuzz_targets/full_stack_target.rs rename to lightning/fuzz/fuzz_targets/full_stack_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/gen_target.sh b/lightning/fuzz/fuzz_targets/msg_targets/gen_target.sh similarity index 100% rename from fuzz/fuzz_targets/msg_targets/gen_target.sh rename to lightning/fuzz/fuzz_targets/msg_targets/gen_target.sh diff --git a/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_accept_channel_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_announcement_signatures_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_channel_announcement_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_channel_reestablish_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_channel_update_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_closing_signed_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_commitment_signed_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_decoded_onion_error_packet_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_error_message_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_funding_created_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_funding_locked_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_funding_signed_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_init_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_init_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_init_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_init_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_node_announcement_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_onion_hop_data_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_open_channel_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_ping_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_ping_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_pong_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_pong_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_revoke_and_ack_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_shutdown_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_target_template.txt b/lightning/fuzz/fuzz_targets/msg_targets/msg_target_template.txt similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_target_template.txt rename to lightning/fuzz/fuzz_targets/msg_targets/msg_target_template.txt diff --git a/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_update_add_htlc_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_htlc_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_update_fail_malformed_htlc_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_update_fee_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs b/lightning/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs rename to lightning/fuzz/fuzz_targets/msg_targets/msg_update_fulfill_htlc_target.rs diff --git a/fuzz/fuzz_targets/msg_targets/utils.rs b/lightning/fuzz/fuzz_targets/msg_targets/utils.rs similarity index 100% rename from fuzz/fuzz_targets/msg_targets/utils.rs rename to lightning/fuzz/fuzz_targets/msg_targets/utils.rs diff --git a/fuzz/fuzz_targets/peer_crypt_target.rs b/lightning/fuzz/fuzz_targets/peer_crypt_target.rs similarity index 100% rename from fuzz/fuzz_targets/peer_crypt_target.rs rename to lightning/fuzz/fuzz_targets/peer_crypt_target.rs diff --git a/fuzz/fuzz_targets/router_target.rs b/lightning/fuzz/fuzz_targets/router_target.rs similarity index 100% rename from fuzz/fuzz_targets/router_target.rs rename to lightning/fuzz/fuzz_targets/router_target.rs diff --git a/fuzz/fuzz_targets/utils/mod.rs b/lightning/fuzz/fuzz_targets/utils/mod.rs similarity index 100% rename from fuzz/fuzz_targets/utils/mod.rs rename to lightning/fuzz/fuzz_targets/utils/mod.rs diff --git a/fuzz/fuzz_targets/utils/test_logger.rs b/lightning/fuzz/fuzz_targets/utils/test_logger.rs similarity index 100% rename from fuzz/fuzz_targets/utils/test_logger.rs rename to lightning/fuzz/fuzz_targets/utils/test_logger.rs diff --git a/fuzz/travis-fuzz.sh b/lightning/fuzz/travis-fuzz.sh similarity index 100% rename from fuzz/travis-fuzz.sh rename to lightning/fuzz/travis-fuzz.sh diff --git a/src/chain/chaininterface.rs b/lightning/src/chain/chaininterface.rs similarity index 100% rename from src/chain/chaininterface.rs rename to lightning/src/chain/chaininterface.rs diff --git a/src/chain/keysinterface.rs b/lightning/src/chain/keysinterface.rs similarity index 100% rename from src/chain/keysinterface.rs rename to lightning/src/chain/keysinterface.rs diff --git a/src/chain/mod.rs b/lightning/src/chain/mod.rs similarity index 100% rename from src/chain/mod.rs rename to lightning/src/chain/mod.rs diff --git a/src/chain/transaction.rs b/lightning/src/chain/transaction.rs similarity index 100% rename from src/chain/transaction.rs rename to lightning/src/chain/transaction.rs diff --git a/src/lib.rs b/lightning/src/lib.rs similarity index 100% rename from src/lib.rs rename to lightning/src/lib.rs diff --git a/src/ln/chan_utils.rs b/lightning/src/ln/chan_utils.rs similarity index 100% rename from src/ln/chan_utils.rs rename to lightning/src/ln/chan_utils.rs diff --git a/src/ln/chanmon_update_fail_tests.rs b/lightning/src/ln/chanmon_update_fail_tests.rs similarity index 100% rename from src/ln/chanmon_update_fail_tests.rs rename to lightning/src/ln/chanmon_update_fail_tests.rs diff --git a/src/ln/channel.rs b/lightning/src/ln/channel.rs similarity index 100% rename from src/ln/channel.rs rename to lightning/src/ln/channel.rs diff --git a/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs similarity index 100% rename from src/ln/channelmanager.rs rename to lightning/src/ln/channelmanager.rs diff --git a/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs similarity index 100% rename from src/ln/channelmonitor.rs rename to lightning/src/ln/channelmonitor.rs diff --git a/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs similarity index 100% rename from src/ln/functional_test_utils.rs rename to lightning/src/ln/functional_test_utils.rs diff --git a/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs similarity index 100% rename from src/ln/functional_tests.rs rename to lightning/src/ln/functional_tests.rs diff --git a/src/ln/mod.rs b/lightning/src/ln/mod.rs similarity index 100% rename from src/ln/mod.rs rename to lightning/src/ln/mod.rs diff --git a/src/ln/msgs.rs b/lightning/src/ln/msgs.rs similarity index 100% rename from src/ln/msgs.rs rename to lightning/src/ln/msgs.rs diff --git a/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs similarity index 100% rename from src/ln/onion_utils.rs rename to lightning/src/ln/onion_utils.rs diff --git a/src/ln/peer_channel_encryptor.rs b/lightning/src/ln/peer_channel_encryptor.rs similarity index 100% rename from src/ln/peer_channel_encryptor.rs rename to lightning/src/ln/peer_channel_encryptor.rs diff --git a/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs similarity index 100% rename from src/ln/peer_handler.rs rename to lightning/src/ln/peer_handler.rs diff --git a/src/ln/router.rs b/lightning/src/ln/router.rs similarity index 100% rename from src/ln/router.rs rename to lightning/src/ln/router.rs diff --git a/src/util/byte_utils.rs b/lightning/src/util/byte_utils.rs similarity index 100% rename from src/util/byte_utils.rs rename to lightning/src/util/byte_utils.rs diff --git a/src/util/chacha20.rs b/lightning/src/util/chacha20.rs similarity index 100% rename from src/util/chacha20.rs rename to lightning/src/util/chacha20.rs diff --git a/src/util/chacha20poly1305rfc.rs b/lightning/src/util/chacha20poly1305rfc.rs similarity index 100% rename from src/util/chacha20poly1305rfc.rs rename to lightning/src/util/chacha20poly1305rfc.rs diff --git a/src/util/config.rs b/lightning/src/util/config.rs similarity index 100% rename from src/util/config.rs rename to lightning/src/util/config.rs diff --git a/src/util/errors.rs b/lightning/src/util/errors.rs similarity index 100% rename from src/util/errors.rs rename to lightning/src/util/errors.rs diff --git a/src/util/events.rs b/lightning/src/util/events.rs similarity index 100% rename from src/util/events.rs rename to lightning/src/util/events.rs diff --git a/src/util/fuzz_wrappers.rs b/lightning/src/util/fuzz_wrappers.rs similarity index 100% rename from src/util/fuzz_wrappers.rs rename to lightning/src/util/fuzz_wrappers.rs diff --git a/src/util/logger.rs b/lightning/src/util/logger.rs similarity index 100% rename from src/util/logger.rs rename to lightning/src/util/logger.rs diff --git a/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs similarity index 100% rename from src/util/macro_logger.rs rename to lightning/src/util/macro_logger.rs diff --git a/src/util/mod.rs b/lightning/src/util/mod.rs similarity index 100% rename from src/util/mod.rs rename to lightning/src/util/mod.rs diff --git a/src/util/poly1305.rs b/lightning/src/util/poly1305.rs similarity index 100% rename from src/util/poly1305.rs rename to lightning/src/util/poly1305.rs diff --git a/src/util/ser.rs b/lightning/src/util/ser.rs similarity index 100% rename from src/util/ser.rs rename to lightning/src/util/ser.rs diff --git a/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs similarity index 100% rename from src/util/ser_macros.rs rename to lightning/src/util/ser_macros.rs diff --git a/src/util/test_utils.rs b/lightning/src/util/test_utils.rs similarity index 100% rename from src/util/test_utils.rs rename to lightning/src/util/test_utils.rs diff --git a/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs similarity index 100% rename from src/util/transaction_utils.rs rename to lightning/src/util/transaction_utils.rs