make default dirs runtime, not compile time. (#1292)

This commit is contained in:
Dmitriy Ryajov 2025-06-26 12:44:24 -06:00 committed by GitHub
parent 352273ff81
commit 7eb2fb12cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -74,8 +74,6 @@ const
codex_enable_proof_failures* {.booldefine.} = false codex_enable_proof_failures* {.booldefine.} = false
codex_enable_log_counter* {.booldefine.} = false codex_enable_log_counter* {.booldefine.} = false
DefaultDataDir* = defaultDataDir()
DefaultCircuitDir* = defaultDataDir() / "circuits"
DefaultThreadCount* = ThreadCount(0) DefaultThreadCount* = ThreadCount(0)
type type
@ -138,8 +136,8 @@ type
dataDir* {. dataDir* {.
desc: "The directory where codex will store configuration and data", desc: "The directory where codex will store configuration and data",
defaultValue: DefaultDataDir, defaultValue: defaultDataDir(),
defaultValueDesc: $DefaultDataDir, defaultValueDesc: "",
abbr: "d", abbr: "d",
name: "data-dir" name: "data-dir"
.}: OutDir .}: OutDir
@ -383,30 +381,30 @@ type
of PersistenceCmd.prover: of PersistenceCmd.prover:
circuitDir* {. circuitDir* {.
desc: "Directory where Codex will store proof circuit data", desc: "Directory where Codex will store proof circuit data",
defaultValue: DefaultCircuitDir, defaultValue: defaultDataDir() / "circuits",
defaultValueDesc: $DefaultCircuitDir, defaultValueDesc: "data/circuits",
abbr: "cd", abbr: "cd",
name: "circuit-dir" name: "circuit-dir"
.}: OutDir .}: OutDir
circomR1cs* {. circomR1cs* {.
desc: "The r1cs file for the storage circuit", desc: "The r1cs file for the storage circuit",
defaultValue: $DefaultCircuitDir / "proof_main.r1cs", defaultValue: defaultDataDir() / "circuits" / "proof_main.r1cs",
defaultValueDesc: $DefaultCircuitDir & "/proof_main.r1cs", defaultValueDesc: "data/circuits/proof_main.r1cs",
name: "circom-r1cs" name: "circom-r1cs"
.}: InputFile .}: InputFile
circomWasm* {. circomWasm* {.
desc: "The wasm file for the storage circuit", desc: "The wasm file for the storage circuit",
defaultValue: $DefaultCircuitDir / "proof_main.wasm", defaultValue: defaultDataDir() / "circuits" / "proof_main.wasm",
defaultValueDesc: $DefaultDataDir & "/circuits/proof_main.wasm", defaultValueDesc: "data/circuits/proof_main.wasm",
name: "circom-wasm" name: "circom-wasm"
.}: InputFile .}: InputFile
circomZkey* {. circomZkey* {.
desc: "The zkey file for the storage circuit", desc: "The zkey file for the storage circuit",
defaultValue: $DefaultCircuitDir / "proof_main.zkey", defaultValue: defaultDataDir() / "circuits" / "proof_main.zkey",
defaultValueDesc: $DefaultDataDir & "/circuits/proof_main.zkey", defaultValueDesc: "data/circuits/proof_main.zkey",
name: "circom-zkey" name: "circom-zkey"
.}: InputFile .}: InputFile