Merge pull request #397 from adorsys/392-use-shared-circuit-breaker-instance-in-mediator

392 use shared circuit breaker instance in mediator

Author: Ogenbertrand

Cargo.lock

@@ -1,7 +1,7 @@
 use nix::fcntl::{Flock, FlockArg};
 use std::{
     fs::OpenOptions,
-    io::{Error as IoError, ErrorKind, Result as IoResult},
+    io::{Error as IoError, Result as IoResult},
     path::Path,
 };
 
@@ -36,7 +36,7 @@ impl FileSystem for StdFileSystem {
             if path.is_file() {
                 files.push(
                     path.to_str()
-                        .ok_or(IoError::new(ErrorKind::Other, "InvalidPath"))?
+                        .ok_or(IoError::other("InvalidPath"))?
                         .to_string(),
                 )
             }
@@ -59,18 +59,14 @@ impl FileSystem for StdFileSystem {
 
         // Acquire an exclusive lock before writing to the file
         let file = Flock::lock(file, FlockArg::LockExclusive)
-            .map_err(|_| IoError::new(ErrorKind::Other, "Error acquiring file lock"))?;
+            .map_err(|_| IoError::other("Error acquiring file lock"))?;
 
-        std::fs::write(path, content).map_err(|_| {
-            IoError::new(
-                ErrorKind::Other,
-                "Error saving base64-encoded image to file",
-            )
-        })?;
+        std::fs::write(path, content)
+            .map_err(|_| IoError::other("Error saving base64-encoded image to file"))?;
 
         // Release the lock after writing to the file
         file.unlock()
-            .map_err(|_| IoError::new(ErrorKind::Other, "Error releasing file lock"))?;
+            .map_err(|_| IoError::other("Error releasing file lock"))?;
 
         Ok(())
     }

crates/filesystem/src/lib.rs

@@ -16,7 +16,6 @@ did-utils.workspace = true
 filesystem.workspace = true
 
 cfg-if.workspace = true
-mongodb.workspace = true
 chrono.workspace = true
 thiserror.workspace = true
 serde_json.workspace = true

crates/web-plugins/did-endpoint/Cargo.toml

@@ -324,7 +324,7 @@ mod tests {
                 let KeyFormat::Jwk(jwk) = key else {
                     return None;
                 };
-                Some(jwk.clone())
+                Some(*jwk.clone())
             }
         }
     }

crates/web-plugins/did-endpoint/src/web.rs

@@ -33,7 +33,6 @@ tracing.workspace = true
 once_cell.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
-dashmap.workspace = true
 http-body-util.workspace = true
 tokio = { workspace = true, features = ["full"] }
 hyper = { workspace = true, features = ["full"] }

crates/web-plugins/didcomm-messaging/Cargo.toml

@@ -167,7 +167,7 @@ pub struct VerificationMethod {
 pub enum KeyFormat {
     Base58(String),
     Multibase(String),
-    Jwk(Jwk),
+    Jwk(Box<Jwk>),
 }
 
 /// Represents a method in a DID Document (authentication, assertion, key agreement, etc.).
@@ -253,7 +253,7 @@ impl VerificationMethod {
         }
 
         if s.public_key_jwk.is_some() {
-            return Ok(Some(KeyFormat::Jwk(s.public_key_jwk.unwrap())));
+            return Ok(Some(KeyFormat::Jwk(Box::new(s.public_key_jwk.unwrap()))));
         }
 
         Ok(None)
@@ -283,7 +283,7 @@ impl VerificationMethod {
         }
 
         if s.private_key_jwk.is_some() {
-            return Ok(Some(KeyFormat::Jwk(s.private_key_jwk.unwrap())));
+            return Ok(Some(KeyFormat::Jwk(Box::new(s.private_key_jwk.unwrap()))));
         }
 
         Ok(None)

crates/web-plugins/didcomm-messaging/did-utils/src/didcore.rs

@@ -218,10 +218,10 @@ impl DidKey {
             controller: format!("did:key:{multibase_value}"),
             public_key: Some(match self.key_format {
                 PublicKeyFormat::Multikey => KeyFormat::Multibase(String::from(multibase_value)),
-                PublicKeyFormat::Jwk => KeyFormat::Jwk(
+                PublicKeyFormat::Jwk => KeyFormat::Jwk(Box::new(
                     alg.build_jwk(raw_public_key_bytes) //
                         .map_err(|_| DIDResolutionError::InternalError)?,
-                ),
+                )),
             }),
             ..Default::default()
         })
@@ -255,10 +255,10 @@ impl DidKey {
             controller: format!("did:key:{multibase_value}"),
             public_key: Some(match self.key_format {
                 PublicKeyFormat::Multikey => KeyFormat::Multibase(encryption_multibase_value),
-                PublicKeyFormat::Jwk => KeyFormat::Jwk(
+                PublicKeyFormat::Jwk => KeyFormat::Jwk(Box::new(
                     alg.build_jwk(encryption_raw_public_key_bytes)
                         .map_err(|_| DIDResolutionError::InternalError)?,
-                ),
+                )),
             }),
             ..Default::default()
         })

crates/web-plugins/didcomm-messaging/did-utils/src/methods/key/method.rs

@@ -457,7 +457,7 @@ impl DidPeer {
             controller: did.to_string(),
             public_key: Some(match self.key_format {
                 PublicKeyFormat::Multikey => KeyFormat::Multibase(String::from(multikey)),
-                PublicKeyFormat::Jwk => KeyFormat::Jwk(alg.build_jwk(key).map_err(|_| DIDResolutionError::InternalError)?),
+                PublicKeyFormat::Jwk => KeyFormat::Jwk(Box::new(alg.build_jwk(key).map_err(|_| DIDResolutionError::InternalError)?)),
             }),
             ..Default::default()
         })
@@ -548,7 +548,7 @@ impl DidPeer {
                     PublicKeyFormat::Multikey => KeyFormat::Multibase(multikey.to_string()),
                     PublicKeyFormat::Jwk => {
                         let (alg, key) = decode_multikey(multikey).map_err(|_| DIDPeerMethodError::MalformedPeerDID)?;
-                        KeyFormat::Jwk(alg.build_jwk(&key).map_err(|_| DIDResolutionError::InternalError)?)
+                        KeyFormat::Jwk(Box::new(alg.build_jwk(&key).map_err(|_| DIDResolutionError::InternalError)?))
                     }
                 }),
                 ..Default::default()

crates/web-plugins/didcomm-messaging/did-utils/src/methods/peer/method.rs

@@ -15,5 +15,4 @@ chrono.workspace = true
 [dev-dependencies]
 did-utils.workspace = true
 keystore.workspace = true
-dashmap.workspace = true
 shared = { workspace = true, features = ["test-utils"] }

crates/web-plugins/didcomm-messaging/protocols/basic-message/Cargo.toml

@@ -19,11 +19,11 @@ mod tests {
     use super::*;
     use axum::http::StatusCode;
     use chrono::Utc;
-    use dashmap::DashMap;
     use did_utils::didcore::Document;
     use keystore::Keystore;
     use serde_json::json;
     use shared::{
+        breaker::CircuitBreaker,
         repository::tests::{MockConnectionRepository, MockMessagesRepository},
         state::AppStateRepository,
     };
@@ -99,7 +99,7 @@ mod tests {
                 diddoc,
                 None,
                 Some(repository),
-                DashMap::new(),
+                CircuitBreaker::new(),
             )
             .unwrap(),
         );