fixed all tests

Moonsong-Labs · May 28, 2024 · 0b51700 · 0b51700
1 parent 9ccd12c
commit 0b51700
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 174 deletions.
diff --git a/cli/src/commands/contract-diff-command.ts b/cli/src/commands/contract-diff-command.ts
@@ -1,7 +1,6 @@
 import { calculateDiffWithUpgrade } from "../lib";
 import { temporaryDirectory } from "tempy";
 import { exec } from "node:child_process";
-import { withSpinner } from "../lib/with-spinner.js";
 import type { EnvBuilder } from "../lib/env-builder.js";
 
 export const contractDiff = async (

diff --git a/cli/src/commands/download-code-command.ts b/cli/src/commands/download-code-command.ts
@@ -11,7 +11,7 @@ export async function downloadCode(
   l1Filter: string[]
 ): Promise<void> {
   await assertDirectoryExists(targetDir);
-  const { diff } = await calculateDiffWithUpgrade(env, upgradeDirectory, false);
+  const { diff } = await calculateDiffWithUpgrade(env, upgradeDirectory);
 
   const l2Client = env.l2Client();
   const repo = await env.contractsRepo();

diff --git a/cli/src/lib/compare-current-state-with.ts b/cli/src/lib/compare-current-state-with.ts
@@ -2,10 +2,9 @@ import { AbiSet, ZkSyncEraState, UpgradeChanges, lookupAndParse, type ZkSyncEraD
 import type { EnvBuilder } from "./env-builder.js";
 import { withSpinner } from "./with-spinner";
 
-export async function calculateDiffWithUpgrade(
+export async function calculateDiffWithUpgrade (
   env: EnvBuilder,
-  upgradeDirectory: string,
-  compile = true
+  upgradeDirectory: string
 ): Promise<{ diff: ZkSyncEraDiff; state: ZkSyncEraState }> {
   const state = await withSpinner(async () => {
     const l1Client = env.l1Client();
@@ -15,9 +14,7 @@ export async function calculateDiffWithUpgrade(
 
   await withSpinner(async () => {
     const repo = await env.contractsRepo();
-    if (compile) {
-      await repo.compile();
-    }
+    await repo.compile();
   }, "Compiling system contracts");
 
   const diff = await withSpinner(async () => {