revert timeout

EspressoSystems · Nov 22, 2024 · c794446 · c794446
1 parent 993bf86
commit c794446
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -224,7 +224,7 @@ jobs:
         run: |
           cargo nextest run --archive-file nextest-archive-postgres.tar.zst --verbose --no-fail-fast \
           --workspace-remap $PWD $(if [ "${{ matrix.version }}" == "2" ]; then echo " smoke"; fi)
-        timeout-minutes: 25
+        timeout-minutes: 10
 
       - name: Dump process compose services logs
         if: always()

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -11,7 +11,7 @@ const L1_PROVIDER_RETRY_INTERVAL: Duration = Duration::from_secs(1);
 // TODO add to .env
 const RECIPIENT_ADDRESS: &str = "0x0000000000000000000000000000000000000000";
 /// Duration in seconds to wait before declaring the chain deceased.
-const SEQUENCER_BLOCKS_TIMEOUT: u64 = 180;
+const SEQUENCER_BLOCKS_TIMEOUT: u64 = 120;
 
 #[derive(Clone, Debug)]
 pub struct TestConfig {

diff --git a/tests/upgrades.rs b/tests/upgrades.rs
@@ -4,7 +4,7 @@ use espresso_types::{FeeVersion, MarketplaceVersion};
 use futures::StreamExt;
 use vbs::version::StaticVersionType;
 
-const SEQUENCER_BLOCKS_TIMEOUT: u64 = 240;
+const SEQUENCER_BLOCKS_TIMEOUT: u64 = 120;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_upgrade() -> Result<()> {
@@ -47,13 +47,8 @@ async fn test_upgrade() -> Result<()> {
             }
 
             // Track how many nodes have been upgraded
-            if header.version() == versions.1 {
-                upgraded_nodes += 1;
-            }
-
-            if upgraded_nodes == subscriptions_size {
-                println!("Upgrade succeeded @ height {}!", header.height());
-                break;
+            if header.version() != versions.1 {
+                continue;
             }
 
             if header.height() > SEQUENCER_BLOCKS_TIMEOUT {