Skip to content

Fix MSRV tests and drop internet-required test #2577

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
Sep 15, 2023
Merged

Fix MSRV tests and drop internet-required test #2577

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
050f5a9
Pin `syn` back to 2.0.32 fix MSRV in testing
TheBlueMatt Sep 14, 2023
0d646b7
Drop `test_esplora_connects_to_public_server`
TheBlueMatt Sep 14, 2023
ba12a86
Pin memchr in our release dependency list due to `core2` using it
TheBlueMatt Sep 14, 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
7 changes: 7 additions & 0 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
# The quote crate switched to Rust edition 2021 starting with v1.0.31, i.e., has MSRV of 1.56
[ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p quote --precise "1.0.30" --verbose

# The syn crate depends on too-new proc-macro2 starting with v2.0.33, i.e., has MSRV of 1.56
[ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p syn:2.0.33 --precise "2.0.32" --verbose

# The proc-macro2 crate switched to Rust edition 2021 starting with v1.0.66, i.e., has MSRV of 1.56
[ "$RUSTC_MINOR_VERSION" -lt 56 ] && cargo update -p proc-macro2 --precise "1.0.65" --verbose

Expand Down Expand Up @@ -120,6 +123,10 @@ if [[ $RUSTC_MINOR_VERSION -gt 67 ]]; then
# lightning-transaction-sync's MSRV is 1.67
cargo check --verbose --color always --features lightning-transaction-sync
else
# The memchr crate switched to an MSRV of 1.60 starting with v2.6.0
# This is currently only a release dependency via core2, which we intend to work with
# rust-bitcoin to remove soon.
[ "$RUSTC_MINOR_VERSION" -lt 60 ] && cargo update -p memchr --precise "2.5.0" --verbose
cargo check --verbose --color always
fi
popd
Expand Down
17 changes: 0 additions & 17 deletions lightning-transaction-sync/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,20 +321,3 @@ async fn test_esplora_syncs() {
_ => panic!("Unexpected event"),
}
}

#[tokio::test]
#[cfg(any(feature = "esplora-async-https", feature = "esplora-blocking"))]
async fn test_esplora_connects_to_public_server() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Def. ACK on dropping this as it was a crutch anyways. I had originally added this as a regression test as we previously missed the https feature, which only yielded an error when connecting to HTTPS endpoints during runtime, and this was the easiest way to assert we can connect without issue.

let mut logger = TestLogger {};
let esplora_url = "https://blockstream.info/api".to_string();
let tx_sync = EsploraSyncClient::new(esplora_url, &mut logger);
let confirmable = TestConfirmable::new();

// Check we connect and pick up on new best blocks
assert_eq!(confirmable.best_block.lock().unwrap().1, 0);
#[cfg(feature = "esplora-async-https")]
tx_sync.sync(vec![&confirmable]).await.unwrap();
#[cfg(feature = "esplora-blocking")]
tx_sync.sync(vec![&confirmable]).unwrap();
assert_ne!(confirmable.best_block.lock().unwrap().1, 0);
}