Skip to content

Commit b5e5435

Browse files
authored
Merge pull request #2055 from TheBlueMatt/2023-02-fning-msrv
Remove the lightning-transaction-sync MSRV
2 parents a0c65c3 + 64a7567 commit b5e5435

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.github/workflows/build.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ jobs:
1515
# 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
1616
1.45.2,
1717
# 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
18-
1.47.0,
19-
# 1.59.0 is the MSRV for lightning-transaction-sync
20-
1.59.0]
18+
1.47.0]
2119
include:
2220
- toolchain: stable
2321
build-net-tokio: true
@@ -73,11 +71,6 @@ jobs:
7371
build-futures: true
7472
build-no-std: true
7573
build-tx-sync: false
76-
- toolchain: 1.59.0
77-
build-net-tokio: false
78-
build-no-std: false
79-
build-futures: false
80-
build-tx-sync: true
8174
runs-on: ${{ matrix.platform }}
8275
steps:
8376
- name: Checkout source code
@@ -93,10 +86,10 @@ jobs:
9386
run: cargo update -p tokio --precise "1.14.0" --verbose
9487
env:
9588
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
96-
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
97-
if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
89+
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio
90+
if: "matrix.build-net-tokio && !matrix.coverage"
9891
run: cargo build --verbose --color always
99-
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
92+
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
10093
if: matrix.coverage
10194
run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
10295
- name: Build on Rust ${{ matrix.toolchain }}
@@ -151,9 +144,9 @@ jobs:
151144
run: |
152145
cd lightning && cargo test --verbose --color always --features backtrace
153146
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio
154-
if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
147+
if: "matrix.build-net-tokio && !matrix.coverage"
155148
run: cargo test --verbose --color always
156-
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
149+
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
157150
if: matrix.coverage
158151
run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
159152
- name: Test no-std builds on Rust ${{ matrix.toolchain }}

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
members = [
44
"lightning",
55
"lightning-block-sync",
6-
"lightning-transaction-sync",
76
"lightning-invoice",
87
"lightning-net-tokio",
98
"lightning-persister",
@@ -13,6 +12,7 @@ members = [
1312

1413
exclude = [
1514
"lightning-custom-message",
15+
"lightning-transaction-sync",
1616
"no-std-check",
1717
]
1818

lightning/src/ln/outbound_payment.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1459,8 +1459,7 @@ mod tests {
14591459
fn initial_send_payment_path_failed_evs() {
14601460
let outbound_payments = OutboundPayments::new();
14611461
let logger = test_utils::TestLogger::new();
1462-
let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
1463-
let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
1462+
let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
14641463
let scorer = Mutex::new(test_utils::TestScorer::new());
14651464
let router = test_utils::TestRouter::new(network_graph, &scorer);
14661465
let secp_ctx = Secp256k1::new();

0 commit comments

Comments
 (0)