fix: disable cacao tests by default

reown-com · Jan 20, 2025 · d0cf10b · d0cf10b
1 parent 6208069
commit d0cf10b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,7 +35,7 @@ jobs:
             rust: nightly
           - name: "Tests"
             cmd: nextest
-            args: run --workspace --all-features
+            args: run --workspace
             rust: stable
           - name: "Documentation Tests"
             cmd: test

diff --git a/relay_client/src/lib.rs b/relay_client/src/lib.rs
@@ -180,7 +180,7 @@ impl MessageIdGenerator {
     pub fn next(&self) -> MessageId {
         let next = self.next.fetch_add(1, Ordering::Relaxed) as u64;
         let timestamp = chrono::Utc::now().timestamp_millis() as u64;
-        let id = timestamp << 8 | next;
+        let id = (timestamp << 8) | next;
 
         MessageId::new(id)
     }

diff --git a/relay_rpc/Cargo.toml b/relay_rpc/Cargo.toml
@@ -5,11 +5,8 @@ edition = "2021"
 license = "Apache-2.0"
 
 [features]
-cacao = [
-    "dep:k256",
-    "dep:sha3",
-    "dep:alloy"
-]
+cacao = ["dep:k256", "dep:sha3", "dep:alloy"]
+cacao-tests = []
 
 [dependencies]
 bs58 = "0.4"
@@ -37,7 +34,12 @@ k256 = { version = "0.13", optional = true }
 sha3 = { version = "0.10", optional = true }
 sha2 = { version = "0.10.6" }
 url = "2"
-alloy = { version = "0.3.6", optional = true, features = ["json-rpc", "provider-http", "contract", "rpc-types-eth"] }
+alloy = { version = "0.3.6", optional = true, features = [
+    "json-rpc",
+    "provider-http",
+    "contract",
+    "rpc-types-eth",
+] }
 strum = { version = "0.26", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]

diff --git a/relay_rpc/src/auth/cacao.rs b/relay_rpc/src/auth/cacao.rs
@@ -169,5 +169,5 @@ impl Cacao {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod tests;
diff --git a/relay_rpc/src/auth/cacao/payload.rs b/relay_rpc/src/auth/cacao/payload.rs
@@ -117,7 +117,7 @@ impl Payload {
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod tests {
     use super::*;
 

diff --git a/relay_rpc/src/auth/cacao/signature/eip1271.rs b/relay_rpc/src/auth/cacao/signature/eip1271.rs
@@ -66,7 +66,7 @@ pub async fn verify_eip1271(
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod test {
     use {
         super::*,

diff --git a/relay_rpc/src/auth/cacao/signature/eip191.rs b/relay_rpc/src/auth/cacao/signature/eip191.rs
@@ -51,7 +51,7 @@ pub fn verify_eip191(
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod tests {
     use {
         crate::auth::cacao::signature::{

diff --git a/relay_rpc/src/auth/cacao/signature/eip6492.rs b/relay_rpc/src/auth/cacao/signature/eip6492.rs
@@ -69,7 +69,7 @@ pub async fn verify_eip6492(
     }
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod test {
     use {
         super::*,

diff --git a/relay_rpc/src/auth/cacao/signature/mod.rs b/relay_rpc/src/auth/cacao/signature/mod.rs
@@ -17,7 +17,7 @@ pub mod eip191;
 pub mod eip6492;
 pub mod get_rpc_url;
 
-#[cfg(test)]
+#[cfg(all(test, feature = "cacao-tests"))]
 mod test_helpers;
 
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Hash)]