From bb0f6964665aa8b0b5e98fa2b3797d345ad1fd30 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 27 Feb 2023 18:28:26 +0000 Subject: [PATCH 1/3] Fix silent rebase conflict in previous PR --- lightning/src/ln/outbound_payment.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs index 0f9b5e1f890..15bba61dda4 100644 --- a/lightning/src/ln/outbound_payment.rs +++ b/lightning/src/ln/outbound_payment.rs @@ -1459,8 +1459,7 @@ mod tests { fn initial_send_payment_path_failed_evs() { let outbound_payments = OutboundPayments::new(); let logger = test_utils::TestLogger::new(); - let genesis_hash = genesis_block(Network::Testnet).header.block_hash(); - let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger)); + let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger)); let scorer = Mutex::new(test_utils::TestScorer::new()); let router = test_utils::TestRouter::new(network_graph, &scorer); let secp_ctx = Secp256k1::new(); From 0fc5a3ae0f4f4d8b80aa76993d83aa8d48632778 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 27 Feb 2023 17:31:15 +0000 Subject: [PATCH 2/3] Remove the `lightning-transaction-sync` MSRV Apparently it has dependencies that don't track an MSRV at all, so we can't practically enforce one in CI. --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8f0aa69d94..d66498d4896 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,9 +15,7 @@ jobs: # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor 1.45.2, # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated - 1.47.0, - # 1.59.0 is the MSRV for lightning-transaction-sync - 1.59.0] + 1.47.0] include: - toolchain: stable build-net-tokio: true @@ -73,11 +71,6 @@ jobs: build-futures: true build-no-std: true build-tx-sync: false - - toolchain: 1.59.0 - build-net-tokio: false - build-no-std: false - build-futures: false - build-tx-sync: true runs-on: ${{ matrix.platform }} steps: - name: Checkout source code From 64a7567928459587ec7f333a9b11c5640e0be3cd Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 27 Feb 2023 17:32:07 +0000 Subject: [PATCH 3/3] Move `lightning-transaction-sync` out of the main workspace Because `lightning-transaction-sync` does not have an MSRV (and because its dev-dependencies are huge), we can't build it by default when devs run `cargo test`, so it is moved out of the top-level workspace. --- .github/workflows/build.yml | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d66498d4896..9fb37f1b4a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,10 +86,10 @@ jobs: run: cargo update -p tokio --precise "1.14.0" --verbose env: CARGO_NET_GIT_FETCH_WITH_CLI: "true" - - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync - if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync" + - name: Build on Rust ${{ matrix.toolchain }} with net-tokio + if: "matrix.build-net-tokio && !matrix.coverage" run: cargo build --verbose --color always - - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation + - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation if: matrix.coverage run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always - name: Build on Rust ${{ matrix.toolchain }} @@ -144,9 +144,9 @@ jobs: run: | cd lightning && cargo test --verbose --color always --features backtrace - name: Test on Rust ${{ matrix.toolchain }} with net-tokio - if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync" + if: "matrix.build-net-tokio && !matrix.coverage" run: cargo test --verbose --color always - - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation + - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation if: matrix.coverage run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always - name: Test no-std builds on Rust ${{ matrix.toolchain }} diff --git a/Cargo.toml b/Cargo.toml index be76477f4c0..5412c496eac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ members = [ "lightning", "lightning-block-sync", - "lightning-transaction-sync", "lightning-invoice", "lightning-net-tokio", "lightning-persister", @@ -13,6 +12,7 @@ members = [ exclude = [ "lightning-custom-message", + "lightning-transaction-sync", "no-std-check", ]