From 980fa4afd69e8a3700958d28ce99780369e10313 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Mon, 3 Nov 2025 10:44:20 +0100 Subject: [PATCH 1/3] Default to `ring` if multiple `rustls` features are set --- src/raw_client.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raw_client.rs b/src/raw_client.rs index 8cb12e2..556348e 100644 --- a/src/raw_client.rs +++ b/src/raw_client.rs @@ -408,7 +408,7 @@ impl RawClient { if rustls::crypto::CryptoProvider::get_default().is_none() { // We install a crypto provider depending on the set feature. - #[cfg(feature = "use-rustls")] + #[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))] rustls::crypto::CryptoProvider::install_default( rustls::crypto::aws_lc_rs::default_provider(), ) @@ -449,7 +449,7 @@ impl RawClient { builder .dangerous() .with_custom_certificate_verifier(std::sync::Arc::new( - #[cfg(feature = "use-rustls")] + #[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))] danger::NoCertificateVerification::new(rustls::crypto::aws_lc_rs::default_provider()), #[cfg(feature = "use-rustls-ring")] danger::NoCertificateVerification::new(rustls::crypto::ring::default_provider()), From 0e28021b3e5f16a792d2eeb3864333c8e762d784 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Mon, 3 Nov 2025 10:49:30 +0100 Subject: [PATCH 2/3] Check in CI that we compile if all `rustls` features are set We assert that we still succeed compilation if multiple `rustls` features are set. --- .github/workflows/cont_integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 312fc00..01a95f3 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -41,6 +41,7 @@ jobs: - run: cargo check --verbose --no-default-features --features=proxy,use-openssl - run: cargo check --verbose --no-default-features --features=proxy,use-rustls - run: cargo check --verbose --no-default-features --features=proxy,use-rustls-ring + - run: cargo check --verbose --no-default-features --features=proxy,use-rustls,use-rustls-ring fmt: name: Rust fmt From 80bf744a706caf60f08a97cf49f02531239715cd Mon Sep 17 00:00:00 2001 From: valued mammal Date: Wed, 29 Oct 2025 19:32:20 -0400 Subject: [PATCH 3/3] test: don't assert the value returned by `relay_fee` Changed `test_relay_fee` to no longer assert the value of min relay fee, and instead assert that the value is non-zero. This fixes a test failure likely due to some nodes now having a smaller default min relay fee (100sat). --- src/raw_client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/raw_client.rs b/src/raw_client.rs index 556348e..5d67467 100644 --- a/src/raw_client.rs +++ b/src/raw_client.rs @@ -1249,7 +1249,7 @@ mod test { let client = RawClient::new(get_test_server(), None).unwrap(); let resp = client.relay_fee().unwrap(); - assert_eq!(resp, 0.00001); + assert!(resp > 0.0); } #[test]