lightningdevkit · TheBlueMatt · Nov 19, 2019 · Nov 15, 2019 · Nov 18, 2019 · Nov 18, 2019
diff --git 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
@@ -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 → lightning-net-tokio/Cargo.toml b/net-tokio/Cargo.toml → 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 → lightning-net-tokio/src/lib.rs b/net-tokio/src/lib.rs → lightning-net-tokio/src/lib.rs
diff --git a/lightning/Cargo.toml 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 → lightning/fuzz/.gitignore b/fuzz/.gitignore → lightning/fuzz/.gitignore
diff --git a/fuzz/Cargo.toml → lightning/fuzz/Cargo.toml b/fuzz/Cargo.toml → lightning/fuzz/Cargo.toml
diff --git a/fuzz/fuzz_targets/chanmon_deser_target.rs → ...fuzz/fuzz_targets/chanmon_deser_target.rs b/fuzz/fuzz_targets/chanmon_deser_target.rs → ...fuzz/fuzz_targets/chanmon_deser_target.rs
diff --git a/.../fuzz_targets/chanmon_fail_consistency.rs → .../fuzz_targets/chanmon_fail_consistency.rs b/.../fuzz_targets/chanmon_fail_consistency.rs → .../fuzz_targets/chanmon_fail_consistency.rs
diff --git a/fuzz/fuzz_targets/full_stack_target.rs → ...ng/fuzz/fuzz_targets/full_stack_target.rs b/fuzz/fuzz_targets/full_stack_target.rs → ...ng/fuzz/fuzz_targets/full_stack_target.rs
diff --git a/fuzz/fuzz_targets/msg_targets/gen_target.sh → ...zz/fuzz_targets/msg_targets/gen_target.sh b/fuzz/fuzz_targets/msg_targets/gen_target.sh → ...zz/fuzz_targets/msg_targets/gen_target.sh
diff --git a/.../msg_targets/msg_accept_channel_target.rs → .../msg_targets/msg_accept_channel_target.rs b/.../msg_targets/msg_accept_channel_target.rs → .../msg_targets/msg_accept_channel_target.rs
diff --git a/...ets/msg_announcement_signatures_target.rs → ...ets/msg_announcement_signatures_target.rs b/...ets/msg_announcement_signatures_target.rs → ...ets/msg_announcement_signatures_target.rs
diff --git a/...argets/msg_channel_announcement_target.rs → ...argets/msg_channel_announcement_target.rs b/...argets/msg_channel_announcement_target.rs → ...argets/msg_channel_announcement_target.rs
diff --git a/...targets/msg_channel_reestablish_target.rs → ...targets/msg_channel_reestablish_target.rs b/...targets/msg_channel_reestablish_target.rs → ...targets/msg_channel_reestablish_target.rs
diff --git a/.../msg_targets/msg_channel_update_target.rs → .../msg_targets/msg_channel_update_target.rs b/.../msg_targets/msg_channel_update_target.rs → .../msg_targets/msg_channel_update_target.rs
diff --git a/.../msg_targets/msg_closing_signed_target.rs → .../msg_targets/msg_closing_signed_target.rs b/.../msg_targets/msg_closing_signed_target.rs → .../msg_targets/msg_closing_signed_target.rs
diff --git a/...g_targets/msg_commitment_signed_target.rs → ...g_targets/msg_commitment_signed_target.rs b/...g_targets/msg_commitment_signed_target.rs → ...g_targets/msg_commitment_signed_target.rs
diff --git a/.../msg_decoded_onion_error_packet_target.rs → .../msg_decoded_onion_error_packet_target.rs b/.../msg_decoded_onion_error_packet_target.rs → .../msg_decoded_onion_error_packet_target.rs
diff --git a/...s/msg_targets/msg_error_message_target.rs → ...s/msg_targets/msg_error_message_target.rs b/...s/msg_targets/msg_error_message_target.rs → ...s/msg_targets/msg_error_message_target.rs
diff --git a/...msg_targets/msg_funding_created_target.rs → ...msg_targets/msg_funding_created_target.rs b/...msg_targets/msg_funding_created_target.rs → ...msg_targets/msg_funding_created_target.rs
diff --git a/.../msg_targets/msg_funding_locked_target.rs → .../msg_targets/msg_funding_locked_target.rs b/.../msg_targets/msg_funding_locked_target.rs → .../msg_targets/msg_funding_locked_target.rs
diff --git a/.../msg_targets/msg_funding_signed_target.rs → .../msg_targets/msg_funding_signed_target.rs b/.../msg_targets/msg_funding_signed_target.rs → .../msg_targets/msg_funding_signed_target.rs
diff --git a/...zz_targets/msg_targets/msg_init_target.rs → ...zz_targets/msg_targets/msg_init_target.rs b/...zz_targets/msg_targets/msg_init_target.rs → ...zz_targets/msg_targets/msg_init_target.rs
diff --git a/...g_targets/msg_node_announcement_target.rs → ...g_targets/msg_node_announcement_target.rs b/...g_targets/msg_node_announcement_target.rs → ...g_targets/msg_node_announcement_target.rs
diff --git a/.../msg_targets/msg_onion_hop_data_target.rs → .../msg_targets/msg_onion_hop_data_target.rs b/.../msg_targets/msg_onion_hop_data_target.rs → .../msg_targets/msg_onion_hop_data_target.rs
diff --git a/...ts/msg_targets/msg_open_channel_target.rs → ...ts/msg_targets/msg_open_channel_target.rs b/...ts/msg_targets/msg_open_channel_target.rs → ...ts/msg_targets/msg_open_channel_target.rs
diff --git a/...zz_targets/msg_targets/msg_ping_target.rs → ...zz_targets/msg_targets/msg_ping_target.rs b/...zz_targets/msg_targets/msg_ping_target.rs → ...zz_targets/msg_targets/msg_ping_target.rs
diff --git a/...zz_targets/msg_targets/msg_pong_target.rs → ...zz_targets/msg_targets/msg_pong_target.rs b/...zz_targets/msg_targets/msg_pong_target.rs → ...zz_targets/msg_targets/msg_pong_target.rs
diff --git a/.../msg_targets/msg_revoke_and_ack_target.rs → .../msg_targets/msg_revoke_and_ack_target.rs b/.../msg_targets/msg_revoke_and_ack_target.rs → .../msg_targets/msg_revoke_and_ack_target.rs
diff --git a/...argets/msg_targets/msg_shutdown_target.rs → ...argets/msg_targets/msg_shutdown_target.rs b/...argets/msg_targets/msg_shutdown_target.rs → ...argets/msg_targets/msg_shutdown_target.rs
diff --git a/...rgets/msg_targets/msg_target_template.txt → ...rgets/msg_targets/msg_target_template.txt b/...rgets/msg_targets/msg_target_template.txt → ...rgets/msg_targets/msg_target_template.txt
diff --git a/...msg_targets/msg_update_add_htlc_target.rs → ...msg_targets/msg_update_add_htlc_target.rs b/...msg_targets/msg_update_add_htlc_target.rs → ...msg_targets/msg_update_add_htlc_target.rs
diff --git a/...sg_targets/msg_update_fail_htlc_target.rs → ...sg_targets/msg_update_fail_htlc_target.rs b/...sg_targets/msg_update_fail_htlc_target.rs → ...sg_targets/msg_update_fail_htlc_target.rs
diff --git a/.../msg_update_fail_malformed_htlc_target.rs → .../msg_update_fail_malformed_htlc_target.rs b/.../msg_update_fail_malformed_htlc_target.rs → .../msg_update_fail_malformed_htlc_target.rs
diff --git a/...gets/msg_targets/msg_update_fee_target.rs → ...gets/msg_targets/msg_update_fee_target.rs b/...gets/msg_targets/msg_update_fee_target.rs → ...gets/msg_targets/msg_update_fee_target.rs
diff --git a/...targets/msg_update_fulfill_htlc_target.rs → ...targets/msg_update_fulfill_htlc_target.rs b/...targets/msg_update_fulfill_htlc_target.rs → ...targets/msg_update_fulfill_htlc_target.rs
diff --git a/fuzz/fuzz_targets/msg_targets/utils.rs → ...ng/fuzz/fuzz_targets/msg_targets/utils.rs b/fuzz/fuzz_targets/msg_targets/utils.rs → ...ng/fuzz/fuzz_targets/msg_targets/utils.rs
diff --git a/fuzz/fuzz_targets/peer_crypt_target.rs → ...ng/fuzz/fuzz_targets/peer_crypt_target.rs b/fuzz/fuzz_targets/peer_crypt_target.rs → ...ng/fuzz/fuzz_targets/peer_crypt_target.rs
diff --git a/fuzz/fuzz_targets/router_target.rs → lightning/fuzz/fuzz_targets/router_target.rs b/fuzz/fuzz_targets/router_target.rs → lightning/fuzz/fuzz_targets/router_target.rs
diff --git a/fuzz/fuzz_targets/utils/mod.rs → lightning/fuzz/fuzz_targets/utils/mod.rs b/fuzz/fuzz_targets/utils/mod.rs → lightning/fuzz/fuzz_targets/utils/mod.rs
diff --git a/fuzz/fuzz_targets/utils/test_logger.rs → ...ng/fuzz/fuzz_targets/utils/test_logger.rs b/fuzz/fuzz_targets/utils/test_logger.rs → ...ng/fuzz/fuzz_targets/utils/test_logger.rs
diff --git a/fuzz/travis-fuzz.sh → lightning/fuzz/travis-fuzz.sh b/fuzz/travis-fuzz.sh → lightning/fuzz/travis-fuzz.sh
diff --git a/src/chain/chaininterface.rs → lightning/src/chain/chaininterface.rs b/src/chain/chaininterface.rs → lightning/src/chain/chaininterface.rs
diff --git a/src/chain/keysinterface.rs → lightning/src/chain/keysinterface.rs b/src/chain/keysinterface.rs → lightning/src/chain/keysinterface.rs
diff --git a/src/chain/mod.rs → lightning/src/chain/mod.rs b/src/chain/mod.rs → lightning/src/chain/mod.rs
diff --git a/src/chain/transaction.rs → lightning/src/chain/transaction.rs b/src/chain/transaction.rs → lightning/src/chain/transaction.rs
diff --git a/src/lib.rs → lightning/src/lib.rs b/src/lib.rs → lightning/src/lib.rs
diff --git a/src/ln/chan_utils.rs → lightning/src/ln/chan_utils.rs b/src/ln/chan_utils.rs → lightning/src/ln/chan_utils.rs
diff --git a/src/ln/chanmon_update_fail_tests.rs → ...tning/src/ln/chanmon_update_fail_tests.rs b/src/ln/chanmon_update_fail_tests.rs → ...tning/src/ln/chanmon_update_fail_tests.rs
diff --git a/src/ln/channel.rs → lightning/src/ln/channel.rs b/src/ln/channel.rs → lightning/src/ln/channel.rs
diff --git a/src/ln/channelmanager.rs → lightning/src/ln/channelmanager.rs b/src/ln/channelmanager.rs → lightning/src/ln/channelmanager.rs
diff --git a/src/ln/channelmonitor.rs → lightning/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs → lightning/src/ln/channelmonitor.rs
diff --git a/src/ln/functional_test_utils.rs → lightning/src/ln/functional_test_utils.rs b/src/ln/functional_test_utils.rs → lightning/src/ln/functional_test_utils.rs
diff --git a/src/ln/functional_tests.rs → lightning/src/ln/functional_tests.rs b/src/ln/functional_tests.rs → lightning/src/ln/functional_tests.rs
diff --git a/src/ln/mod.rs → lightning/src/ln/mod.rs b/src/ln/mod.rs → lightning/src/ln/mod.rs
diff --git a/src/ln/msgs.rs → lightning/src/ln/msgs.rs b/src/ln/msgs.rs → lightning/src/ln/msgs.rs
diff --git a/src/ln/onion_utils.rs → lightning/src/ln/onion_utils.rs b/src/ln/onion_utils.rs → lightning/src/ln/onion_utils.rs
diff --git a/src/ln/peer_channel_encryptor.rs → lightning/src/ln/peer_channel_encryptor.rs b/src/ln/peer_channel_encryptor.rs → lightning/src/ln/peer_channel_encryptor.rs
diff --git a/src/ln/peer_handler.rs → lightning/src/ln/peer_handler.rs b/src/ln/peer_handler.rs → lightning/src/ln/peer_handler.rs
diff --git a/src/ln/router.rs → lightning/src/ln/router.rs b/src/ln/router.rs → lightning/src/ln/router.rs
diff --git a/src/util/byte_utils.rs → lightning/src/util/byte_utils.rs b/src/util/byte_utils.rs → lightning/src/util/byte_utils.rs
diff --git a/src/util/chacha20.rs → lightning/src/util/chacha20.rs b/src/util/chacha20.rs → lightning/src/util/chacha20.rs
diff --git a/src/util/chacha20poly1305rfc.rs → lightning/src/util/chacha20poly1305rfc.rs b/src/util/chacha20poly1305rfc.rs → lightning/src/util/chacha20poly1305rfc.rs
diff --git a/src/util/config.rs → lightning/src/util/config.rs b/src/util/config.rs → lightning/src/util/config.rs
diff --git a/src/util/errors.rs → lightning/src/util/errors.rs b/src/util/errors.rs → lightning/src/util/errors.rs
diff --git a/src/util/events.rs → lightning/src/util/events.rs b/src/util/events.rs → lightning/src/util/events.rs
diff --git a/src/util/fuzz_wrappers.rs → lightning/src/util/fuzz_wrappers.rs b/src/util/fuzz_wrappers.rs → lightning/src/util/fuzz_wrappers.rs
diff --git a/src/util/logger.rs → lightning/src/util/logger.rs b/src/util/logger.rs → lightning/src/util/logger.rs
diff --git a/src/util/macro_logger.rs → lightning/src/util/macro_logger.rs b/src/util/macro_logger.rs → lightning/src/util/macro_logger.rs
diff --git a/src/util/mod.rs → lightning/src/util/mod.rs b/src/util/mod.rs → lightning/src/util/mod.rs
diff --git a/src/util/poly1305.rs → lightning/src/util/poly1305.rs b/src/util/poly1305.rs → lightning/src/util/poly1305.rs
diff --git a/src/util/ser.rs → lightning/src/util/ser.rs b/src/util/ser.rs → lightning/src/util/ser.rs
diff --git a/src/util/ser_macros.rs → lightning/src/util/ser_macros.rs b/src/util/ser_macros.rs → lightning/src/util/ser_macros.rs
diff --git a/src/util/test_utils.rs → lightning/src/util/test_utils.rs b/src/util/test_utils.rs → lightning/src/util/test_utils.rs
diff --git a/src/util/transaction_utils.rs → lightning/src/util/transaction_utils.rs b/src/util/transaction_utils.rs → lightning/src/util/transaction_utils.rs