fixup! Update opentelemetry to 0.32

Author: benalleng

payjoin-cli/tests/e2e.rs

@@ -103,8 +103,9 @@ mod e2e {
     #[cfg(feature = "v1")]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn send_receive_payjoin_v1() -> Result<(), BoxError> {
-        use payjoin_test_utils::local_cert_key;
+        use payjoin_test_utils::{init_crypto_provider, local_cert_key};
 
+        init_crypto_provider();
         let (bitcoind, _sender, _receiver) = init_bitcoind_sender_receiver(None, None)?;
         let temp_dir = tempdir()?;
         let receiver_db_path = temp_dir.path().join("receiver_db");
@@ -235,12 +236,13 @@ mod e2e {
     #[cfg(feature = "v2")]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn send_receive_payjoin_v2() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        use payjoin_test_utils::{init_tracing, TestServices};
+        use payjoin_test_utils::{init_crypto_provider, init_tracing, TestServices};
         use tempfile::TempDir;
 
         type Result<T> = std::result::Result<T, BoxError>;
 
         init_tracing();
+        init_crypto_provider();
         let mut services = TestServices::initialize_with_relays(3).await?;
         let temp_dir = tempdir()?;
 
@@ -522,12 +524,15 @@ mod e2e {
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn send_receive_payjoin_v2_to_v1() -> Result<(), Box<dyn std::error::Error + Send + Sync>>
     {
-        use payjoin_test_utils::{init_tracing, local_cert_key, TestServices};
+        use payjoin_test_utils::{
+            init_crypto_provider, init_tracing, local_cert_key, TestServices,
+        };
         use tempfile::TempDir;
 
         type Result<T> = std::result::Result<T, BoxError>;
 
         init_tracing();
+        init_crypto_provider();
         let services = TestServices::initialize_with_relays(3).await?;
         let temp_dir = tempdir()?;
 
@@ -679,12 +684,13 @@ mod e2e {
     #[cfg(feature = "v2")]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn sender_cancel_v2() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        use payjoin_test_utils::{init_tracing, TestServices};
+        use payjoin_test_utils::{init_crypto_provider, init_tracing, TestServices};
         use tempfile::TempDir;
 
         type Result<T> = std::result::Result<T, BoxError>;
 
         init_tracing();
+        init_crypto_provider();
         let mut services = TestServices::initialize_with_relays(3).await?;
         let temp_dir = tempdir()?;
 
@@ -855,12 +861,13 @@ mod e2e {
     #[cfg(feature = "v2")]
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn receiver_cancel_v2() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        use payjoin_test_utils::{init_tracing, TestServices};
+        use payjoin_test_utils::{init_crypto_provider, init_tracing, TestServices};
         use tempfile::TempDir;
 
         type Result<T> = std::result::Result<T, BoxError>;
 
         init_tracing();
+        init_crypto_provider();
         let mut services = TestServices::initialize_with_relays(3).await?;
         let temp_dir = tempdir()?;
 

payjoin-test-utils/src/lib.rs

@@ -17,6 +17,7 @@ pub type BoxError = Box<dyn std::error::Error + 'static>;
 pub type BoxSendSyncError = Box<dyn std::error::Error + Send + Sync>;
 
 static INIT_TRACING: OnceCell<()> = OnceCell::new();
+static INIT_CRYPTO_PROVIDER: OnceCell<()> = OnceCell::new();
 
 pub fn init_tracing() {
     INIT_TRACING.get_or_init(|| {
@@ -30,6 +31,14 @@ pub fn init_tracing() {
     });
 }
 
+pub fn init_crypto_provider() {
+    INIT_CRYPTO_PROVIDER.get_or_init(|| {
+        rustls::crypto::ring::default_provider()
+            .install_default()
+            .expect("Failed to install default crypto provider");
+    });
+}
+
 pub fn init_bitcoind() -> Result<corepc_node::Node, BoxError> {
     let bitcoind_exe = corepc_node::exe_path()?;
     let mut conf = corepc_node::Conf::default();

payjoin/tests/integration.rs

@@ -213,7 +213,8 @@ mod integration {
         use payjoin::send::ResponseError;
         use payjoin::{OhttpKeys, PjUri, UriExt};
         use payjoin_test_utils::{
-            BoxSendSyncError, InMemoryPersister, SessionPersister, TestServices,
+            init_crypto_provider, BoxSendSyncError, InMemoryPersister, SessionPersister,
+            TestServices,
         };
         #[cfg(feature = "v1")]
         use reqwest::Client;
@@ -233,6 +234,7 @@ mod integration {
 
         #[tokio::test]
         async fn test_bad_ohttp_keys() -> Result<(), BoxSendSyncError> {
+            init_crypto_provider();
             let bytes = CheckedHrpstring::new::<NoChecksum>(
                 "OH1QYPM5JXYNS754Y4R45QWE336QFX6ZR8DQGVQCULVZTV20TFVEYDMFQC",
             )?