Fix for upgrade-test

matter-labs · Oct 26, 2023 · 588ceae · 588ceae
1 parent b3c59d7
commit 588ceae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/core/lib/types/src/protocol_version.rs b/core/lib/types/src/protocol_version.rs
@@ -74,6 +74,11 @@ impl ProtocolVersionId {
     }
 
     pub fn is_pre_boojum(&self) -> bool {
+        // TODO: Fix for upgrade test. Remove when boojum code will be merged fully.
+        if std::env::var("ZKSYNC_PRE_BOOJUM").is_ok() {
+            return true;
+        }
+
         self < &ProtocolVersionId::Version17
     }
 }

diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -62,7 +62,7 @@ describe('Upgrade test', function () {
         process.env.CHAIN_STATE_KEEPER_BLOCK_COMMIT_DEADLINE_MS = '2000';
         // Run server in background.
         utils.background(
-            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper',
+            'cd $ZKSYNC_HOME && ZKSYNC_PRE_BOOJUM=true cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper',
             [null, logs, logs]
         );
         // Server may need some time to recompile if it's a cold run, so wait for it.
@@ -251,7 +251,7 @@ describe('Upgrade test', function () {
 
         // Run again.
         utils.background(
-            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper &>> upgrade.log',
+            'cd $ZKSYNC_HOME && ZKSYNC_PRE_BOOJUM=true cargo run --bin zksync_server --release -- --components=api,tree,eth,data_fetcher,state_keeper &>> upgrade.log',
             [null, logs, logs]
         );
         await utils.sleep(10);