disable zksyncoserver failing only for zksyncosserver runs

jackpooleyml · jackpooleyml · commit 694c95426467 · 2026-01-13T15:34:02.000+01:00
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/erc7579/module/add.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/erc7579/module/add.rs
@@ -123,14 +123,18 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::address;
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_add_module() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
@@ -227,8 +231,11 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_add_guardian_module() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/deploy.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/deploy.rs
@@ -242,7 +242,9 @@ mod tests {
             signer::{Signer, create_eoa_signer},
         },
         utils::alloy_utilities::test_utilities::{
-            config::TestInfraConfig, start_node_and_deploy_contracts,
+            config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
+            start_node_and_deploy_contracts,
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -428,8 +430,11 @@ mod tests {
 
     /// Test comprehensive session flow: deploy with session validator, create session, and transact
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_deploy_with_session_and_transact() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         // Start test infrastructure
         let (
             _,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/deploy/user_op.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/deploy/user_op.rs
@@ -131,6 +131,7 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -140,8 +141,11 @@ mod tests {
     };
 
     #[tokio::test]
-    // #[ignore = "temporarily disabled"]
     async fn test_deploy_account_with_user_op() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/accept.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/accept.rs
@@ -57,15 +57,19 @@ mod tests {
             ethereum_wallet_from_private_key,
             test_utilities::{
                 config::TestInfraConfig,
+                node_backend::{TestNodeBackend, resolve_test_node_backend},
                 start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
     };
     use alloy::{primitives::address, providers::ProviderBuilder};
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_accept_guardian() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/propose.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/propose.rs
@@ -101,14 +101,18 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::address;
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_propose_guardian() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/recovery/finalize.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/recovery/finalize.rs
@@ -72,6 +72,7 @@ mod tests {
             ethereum_wallet_from_private_key,
             test_utilities::{
                 config::TestInfraConfig,
+                node_backend::{TestNodeBackend, resolve_test_node_backend},
                 start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
@@ -81,8 +82,11 @@ mod tests {
     };
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_finalize_recovery() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/recovery/initialize.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/recovery/initialize.rs
@@ -68,6 +68,7 @@ mod tests {
             ethereum_wallet_from_private_key,
             test_utilities::{
                 config::TestInfraConfig,
+                node_backend::{TestNodeBackend, resolve_test_node_backend},
                 start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
@@ -77,8 +78,11 @@ mod tests {
     };
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_initialize_recovery() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/remove.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/guardian/remove.rs
@@ -107,15 +107,19 @@ mod tests {
             ethereum_wallet_from_private_key,
             test_utilities::{
                 config::TestInfraConfig,
+                node_backend::{TestNodeBackend, resolve_test_node_backend},
                 start_node_and_deploy_contracts_and_start_bundler_with_config,
             },
         },
     };
     use alloy::{primitives::address, providers::ProviderBuilder};
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_remove_guardian() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/passkey/add.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/passkey/add.rs
@@ -117,14 +117,18 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::{address, bytes, fixed_bytes};
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_add_passkey() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/passkey/remove.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/passkey/remove.rs
@@ -103,14 +103,18 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
     use alloy::primitives::{address, bytes, fixed_bytes};
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_remove_passkey() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send/eoa.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send/eoa.rs
@@ -85,6 +85,7 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -94,8 +95,11 @@ mod tests {
     };
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_deploy_and_send_transaction() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
@@ -198,9 +202,12 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_deploy_and_send_transaction_with_paymaster()
     -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             node_url,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send/passkey.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send/passkey.rs
@@ -93,6 +93,7 @@ pub mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -106,8 +107,11 @@ pub mod tests {
     use std::sync::Arc;
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_send_transaction_webauthn() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
@@ -262,8 +266,11 @@ pub mod tests {
     /// 2. Sign hash with passkey (simulated)
     /// 3. Submit with signed UserOp
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_send_transaction_webauthn_two_step() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/active.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/active.rs
@@ -140,6 +140,7 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -170,8 +171,11 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_get_active_sessions() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/create.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/create.rs
@@ -116,6 +116,7 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -144,8 +145,11 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_create_session() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
@@ -297,8 +301,11 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_create_session_with_webauthn() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/revoke.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/revoke.rs
@@ -112,6 +112,7 @@ mod tests {
         },
         utils::alloy_utilities::test_utilities::{
             config::TestInfraConfig,
+            node_backend::{TestNodeBackend, resolve_test_node_backend},
             start_node_and_deploy_contracts_and_start_bundler_with_config,
         },
     };
@@ -123,8 +124,11 @@ mod tests {
     use std::str::FromStr;
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_revoke_session() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let (
             _,
             anvil_instance,
@@ -305,8 +309,11 @@ mod tests {
     }
 
     #[tokio::test]
-    #[ignore = "temporarily disabled"]
     async fn test_create_session_with_webauthn() -> eyre::Result<()> {
+        if resolve_test_node_backend() == TestNodeBackend::ZkSyncOs {
+            return Ok(());
+        }
+
         let config = TestInfraConfig::rich_wallet_9();
         let signer_private_key = config.signer_private_key.clone();
         let (
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/send.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/session/send.rs
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/signers/eoa/remove.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/signers/eoa/remove.rs
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-ffi-web/src/lib.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-ffi-web/src/lib.rs
