Skip to content

Remove the lightning-transaction-sync MSRV #2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2023
Merged

Remove the lightning-transaction-sync MSRV #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb0f696
Fix silent rebase conflict in previous PR
TheBlueMatt Feb 27, 2023
0fc5a3a
Remove the `lightning-transaction-sync` MSRV
TheBlueMatt Feb 27, 2023
64a7567
Move `lightning-transaction-sync` out of the main workspace
TheBlueMatt Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -93,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 }}
Expand Down Expand Up @@ -151,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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.

Copy link
Contributor

@wpaulino wpaulino Feb 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.

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 }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
members = [
"lightning",
"lightning-block-sync",
"lightning-transaction-sync",
"lightning-invoice",
"lightning-net-tokio",
"lightning-persister",
Expand All @@ -13,6 +12,7 @@ members = [

exclude = [
"lightning-custom-message",
"lightning-transaction-sync",
"no-std-check",
]

Expand Down
3 changes: 1 addition & 2 deletions lightning/src/ln/outbound_payment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down