Requested changes for PR #310

- Renamed "CARGO_WORKSPACE_DIR" --> "ZK_EVM_WORKSPACE_DIR".
0xPolygonZero · Jul 9, 2024 · 67535cc · 67535cc
1 parent 3df7730
commit 67535cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -5,4 +5,4 @@ rustflags = ["-Z", "linker-features=-lld"]
 
 [env]
 # If we're running in the project workspace, then we should set the workspace env var so we read/write to/from files relative to the workspace.
-CARGO_WORKSPACE_DIR = { value = "", relative = true }
+ZK_EVM_WORKSPACE_DIR = { value = "", relative = true }
diff --git a/zero_bin/common/src/prover_state/persistence.rs b/zero_bin/common/src/prover_state/persistence.rs
@@ -20,7 +20,7 @@ use super::{
 const CIRCUITS_DIR: &str = "circuits/";
 const PROVER_STATE_FILE_PREFIX: &str = "prover_state";
 const VERIFIER_STATE_FILE_PREFIX: &str = "verifier_state";
-const CARGO_WORKSPACE_DIR_ENV: &str = "CARGO_WORKSPACE_DIR";
+const ZK_EVM_WORKSPACE_DIR_ENV: &str = "ZK_EVM_WORKSPACE_DIR";
 
 fn get_serializers() -> (
     DefaultGateSerializer,
@@ -281,7 +281,7 @@ fn prover_to_disk(
 /// directory that lives in `tools/`. Otherwise, just use `circuits` in the
 /// current directory.
 fn relative_circuit_dir_path() -> String {
-    env::var(CARGO_WORKSPACE_DIR_ENV)
+    env::var(ZK_EVM_WORKSPACE_DIR_ENV)
         .map(|p| format!("{}tools/{}", p, CIRCUITS_DIR))
         .unwrap_or_else(|_| CIRCUITS_DIR.to_string())
 }
diff --git a/zero_bin/tools/prove_stdio.sh b/zero_bin/tools/prove_stdio.sh
@@ -20,7 +20,7 @@ VERIFY_OUT_PATH="${TOOLS_DIR}/verify.out"
 TEST_OUT_PATH="${TOOLS_DIR}/test.out"
 
 # Set the environment variable to let the binary know that we're running in the project workspace.
-export CARGO_WORKSPACE_DIR="${TOOLS_DIR}/../"
+export ZK_EVM_WORKSPACE_DIR="${TOOLS_DIR}/../"
 
 # Configured Rayon and Tokio with rough defaults
 export RAYON_NUM_THREADS=$num_procs