chore: fix CI

reown-com · Sep 19, 2024 · 97f0807 · 97f0807
1 parent e21b18d
commit 97f0807
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 27 deletions.
diff --git a/relay_rpc/Cargo.toml b/relay_rpc/Cargo.toml
@@ -42,6 +42,7 @@ strum = { version = "0.26", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]
 tokio = { version = "1.35.1", features = ["test-util", "macros"] }
+alloy = { version = "0.3.6", features = ["node-bindings"] }
 
 [build-dependencies]
 serde_json = "1.0"

diff --git a/relay_rpc/src/auth/cacao.rs b/relay_rpc/src/auth/cacao.rs
@@ -52,10 +52,14 @@ pub enum CacaoError {
     Verification,
 
     #[error("Internal EIP-1271 resolution error: {0}")]
-    Eip1271Internal(alloy::rpc::json_rpc::RpcError<alloy::transports::TransportErrorKind, Box<RawValue>>),
+    Eip1271Internal(
+        alloy::rpc::json_rpc::RpcError<alloy::transports::TransportErrorKind, Box<RawValue>>,
+    ),
 
     #[error("Internal EIP-6492 resolution error: {0}")]
-    Eip6492Internal(alloy::rpc::json_rpc::RpcError<alloy::transports::TransportErrorKind, Box<RawValue>>),
+    Eip6492Internal(
+        alloy::rpc::json_rpc::RpcError<alloy::transports::TransportErrorKind, Box<RawValue>>,
+    ),
 }
 
 impl From<std::fmt::Error> for CacaoError {

diff --git a/relay_rpc/src/auth/cacao/signature/eip1271.rs b/relay_rpc/src/auth/cacao/signature/eip1271.rs
@@ -1,9 +1,12 @@
 use {
     super::CacaoError,
-    alloy::primitives::Address,
-    alloy::providers::{network::Ethereum, Provider, ReqwestProvider},
-    alloy::rpc::types::{TransactionInput, TransactionRequest},
-    alloy::{sol, sol_types::SolCall},
+    alloy::{
+        primitives::Address,
+        providers::{network::Ethereum, Provider, ReqwestProvider},
+        rpc::types::{TransactionInput, TransactionRequest},
+        sol,
+        sol_types::SolCall,
+    },
     url::Url,
 };
 
@@ -39,20 +42,17 @@ pub async fn verify_eip1271(
             .into(),
         ));
 
-    let result = provider
-        .call(&call_request)
-        .await
-        .map_err(|e| {
-            if let Some(error_response) = e.as_error_resp() {
-                if error_response.message.starts_with("execution reverted:") {
-                    CacaoError::Verification
-                } else {
-                    CacaoError::Eip1271Internal(e)
-                }
+    let result = provider.call(&call_request).await.map_err(|e| {
+        if let Some(error_response) = e.as_error_resp() {
+            if error_response.message.starts_with("execution reverted:") {
+                CacaoError::Verification
             } else {
                 CacaoError::Eip1271Internal(e)
             }
-        })?;
+        } else {
+            CacaoError::Eip1271Internal(e)
+        }
+    })?;
 
     let magic = result.get(..4);
     if let Some(magic) = magic {

diff --git a/relay_rpc/src/auth/cacao/signature/eip191.rs b/relay_rpc/src/auth/cacao/signature/eip191.rs
@@ -58,7 +58,7 @@ mod tests {
             eip191::verify_eip191,
             test_helpers::{message_hash_internal, sign_message},
         },
-        alloy_primitives::Address,
+        alloy::primitives::Address,
         k256::ecdsa::SigningKey,
     };
 

diff --git a/relay_rpc/src/auth/cacao/signature/eip6492.rs b/relay_rpc/src/auth/cacao/signature/eip6492.rs
@@ -1,9 +1,12 @@
 use {
     crate::auth::cacao::CacaoError,
-    alloy::primitives::Address,
-    alloy::providers::{network::Ethereum, Provider, ReqwestProvider},
-    alloy::rpc::types::{TransactionInput, TransactionRequest},
-    alloy::{sol, sol_types::SolConstructor},
+    alloy::{
+        primitives::Address,
+        providers::{network::Ethereum, Provider, ReqwestProvider},
+        rpc::types::{TransactionInput, TransactionRequest},
+        sol,
+        sol_types::SolConstructor,
+    },
     url::Url,
 };
 
@@ -73,12 +76,18 @@ mod test {
         crate::auth::cacao::signature::{
             strip_hex_prefix,
             test_helpers::{
-                deploy_contract, message_hash, sign_message, spawn_anvil, CREATE2_CONTRACT,
+                deploy_contract,
+                message_hash,
+                sign_message,
+                spawn_anvil,
+                CREATE2_CONTRACT,
                 EIP1271_MOCK_CONTRACT,
             },
         },
-        alloy::primitives::{address, b256, Uint},
-        alloy::sol_types::{SolCall, SolValue},
+        alloy::{
+            primitives::{address, b256, Uint},
+            sol_types::{SolCall, SolValue},
+        },
         k256::ecdsa::SigningKey,
     };
 

diff --git a/relay_rpc/src/auth/cacao/signature/test_helpers.rs b/relay_rpc/src/auth/cacao/signature/test_helpers.rs
@@ -1,7 +1,9 @@
 use {
     super::eip191::eip191_bytes,
-    alloy_node_bindings::{Anvil, AnvilInstance},
-    alloy_primitives::Address,
+    alloy::{
+        node_bindings::{Anvil, AnvilInstance},
+        primitives::Address,
+    },
     k256::ecdsa::SigningKey,
     regex::Regex,
     sha2::Digest,