Skip to content

Commit b185259

Browse files
committed
Merge #183: Default to ring if multiple rustls features are set
80bf744 test: don't assert the value returned by `relay_fee` (valued mammal) 0e28021 Check in CI that we compile if all `rustls` features are set (Elias Rohrer) 980fa4a Default to `ring` if multiple `rustls` features are set (Elias Rohrer) Pull request description: Fixes #181 We default to use `ring` if multiple features are set, ensuring the features are additive. To that end, we also add a check to CI that asserts we succeed to build with both features set. Would be cool to get a patch release for this, as it's currently breaking our docs.rs builds in `lightning-liquidity`. ACKs for top commit: ValuedMammal: ACK 80bf744. oleonardolima: cACK 80bf744 Tree-SHA512: 0b1bacb0f3a57fd8c666e1ece14b9a733f9d5dfdec7efd6461b400d58ef0e302c286597531381e417b5fdf1b97659ed36266d2cf89f8a0c4cab5e4d9b3fdeed7
2 parents b20d41a + 80bf744 commit b185259

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/cont_integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
- run: cargo check --verbose --no-default-features --features=proxy,use-openssl
4242
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls
4343
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls-ring
44+
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls,use-rustls-ring
4445

4546
fmt:
4647
name: Rust fmt

src/raw_client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ impl RawClient<ElectrumSslStream> {
408408

409409
if rustls::crypto::CryptoProvider::get_default().is_none() {
410410
// We install a crypto provider depending on the set feature.
411-
#[cfg(feature = "use-rustls")]
411+
#[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))]
412412
rustls::crypto::CryptoProvider::install_default(
413413
rustls::crypto::aws_lc_rs::default_provider(),
414414
)
@@ -449,7 +449,7 @@ impl RawClient<ElectrumSslStream> {
449449
builder
450450
.dangerous()
451451
.with_custom_certificate_verifier(std::sync::Arc::new(
452-
#[cfg(feature = "use-rustls")]
452+
#[cfg(all(feature = "use-rustls", not(feature = "use-rustls-ring")))]
453453
danger::NoCertificateVerification::new(rustls::crypto::aws_lc_rs::default_provider()),
454454
#[cfg(feature = "use-rustls-ring")]
455455
danger::NoCertificateVerification::new(rustls::crypto::ring::default_provider()),
@@ -1249,7 +1249,7 @@ mod test {
12491249
let client = RawClient::new(get_test_server(), None).unwrap();
12501250

12511251
let resp = client.relay_fee().unwrap();
1252-
assert_eq!(resp, 0.00001);
1252+
assert!(resp > 0.0);
12531253
}
12541254

12551255
#[test]

0 commit comments

Comments
 (0)