Skip to content

Commit eba329c

Browse files
authored
Merge pull request #3304 from TheBlueMatt/2024-09-tokio-util-msrv
Fix MSRV builds of `lightning-transaction-sync` in CI
2 parents d35239c + 35bc575 commit eba329c

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

ci/ci-tests.sh

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ function PIN_RELEASE_DEPS {
1111
# Starting with version 1.39.0, the `tokio` crate has an MSRV of rustc 1.70.0
1212
[ "$RUSTC_MINOR_VERSION" -lt 70 ] && cargo update -p tokio --precise "1.38.1" --verbose
1313

14+
# Starting with version 0.7.12, the `tokio-util` crate has an MSRV of rustc 1.70.0
15+
[ "$RUSTC_MINOR_VERSION" -lt 70 ] && cargo update -p tokio-util --precise "0.7.11" --verbose
16+
1417
return 0 # Don't fail the script if our rustc is higher than the last check
1518
}
1619

lightning-transaction-sync/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ electrum-client = { version = "0.21.0", optional = true }
3232

3333
[dev-dependencies]
3434
lightning = { version = "0.0.124", path = "../lightning", default-features = false, features = ["std", "_test_utils"] }
35-
tokio = { version = "1.35.0", features = ["full"] }
35+
tokio = { version = "1.35.0", features = ["macros"] }
3636

3737
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
3838
electrsd = { version = "0.28.0", default-features = false, features = ["legacy"] }

msrv-no-dev-deps-check/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ edition = "2021"
66
[dependencies]
77
lightning = { path = "../lightning" }
88
lightning-block-sync = { path = "../lightning-block-sync", features = [ "rest-client", "rpc-client" ] }
9+
lightning-transaction-sync = { path = "../lightning-transaction-sync", features = [ "esplora-async-https", "electrum" ] }
910
lightning-invoice = { path = "../lightning-invoice" }
1011
lightning-net-tokio = { path = "../lightning-net-tokio" }
1112
lightning-persister = { path = "../lightning-persister" }

0 commit comments

Comments
 (0)