diff --git a/tests/integration/codexconfig.nim b/tests/integration/codexconfig.nim index 5f15331b..2a63c36f 100644 --- a/tests/integration/codexconfig.nim +++ b/tests/integration/codexconfig.nim @@ -21,7 +21,8 @@ type configs*: seq[CodexConfig] CodexConfig* = object cliOptions: Table[StartUpCmd, Table[string, CliOption]] - cliPersistenceOptions: Table[PersistenceCmd, Table[string, CliOption]] + # TODO: uncomment once PersistenceCmd is added + # cliPersistenceOptions: Table[PersistenceCmd, Table[string, CliOption]] debugEnabled*: bool CodexConfigError* = object of CatchableError @@ -63,22 +64,24 @@ proc buildConfig( ## TODO: remove once proper exception handling added to nim-confutils raiseCodexConfigError msg & e.msg.postFix -proc addCliOption*( - config: var CodexConfig, - group = PersistenceCmd.noCmd, - cliOption: CliOption) {.raises: [CodexConfigError].} = +# TODO: uncomment once PersistenceCmd is added +# proc addCliOption*( +# config: var CodexConfig, +# group = PersistenceCmd.noCmd, +# cliOption: CliOption) {.raises: [CodexConfigError].} = - var options = config.cliPersistenceOptions.getOrDefault(group) - options[cliOption.key] = cliOption # overwrite if already exists - config.cliPersistenceOptions[group] = options - discard config.buildConfig("Invalid cli arg " & $cliOption) +# var options = config.cliPersistenceOptions.getOrDefault(group) +# options[cliOption.key] = cliOption # overwrite if already exists +# config.cliPersistenceOptions[group] = options +# discard config.buildConfig("Invalid cli arg " & $cliOption) -proc addCliOption*( - config: var CodexConfig, - group = PersistenceCmd.noCmd, - key: string, value = "") {.raises: [CodexConfigError].} = +# TODO: uncomment once PersistenceCmd is added +# proc addCliOption*( +# config: var CodexConfig, +# group = PersistenceCmd.noCmd, +# key: string, value = "") {.raises: [CodexConfigError].} = - config.addCliOption(group, CliOption(key: key, value: value)) +# config.addCliOption(group, CliOption(key: key, value: value)) proc addCliOption*( config: var CodexConfig, @@ -123,12 +126,13 @@ proc cliArgs*( var opts = config.cliOptions[cmd].values.toSeq args = args.concat( opts.map(o => $o) ) - for cmd in PersistenceCmd: - if config.cliPersistenceOptions.hasKey(cmd): - if cmd != PersistenceCmd.noCmd: - args.add $cmd - var opts = config.cliPersistenceOptions[cmd].values.toSeq - args = args.concat( opts.map(o => $o) ) + # TODO: uncomment once PersistenceCmd is added + # for cmd in PersistenceCmd: + # if config.cliPersistenceOptions.hasKey(cmd): + # if cmd != PersistenceCmd.noCmd: + # args.add $cmd + # var opts = config.cliPersistenceOptions[cmd].values.toSeq + # args = args.concat( opts.map(o => $o) ) return args diff --git a/tests/integration/multinodes.nim b/tests/integration/multinodes.nim index 5212de32..143f0cdf 100644 --- a/tests/integration/multinodes.nim +++ b/tests/integration/multinodes.nim @@ -204,9 +204,10 @@ template multinodesuite*(name: string, body: untyped) = var config = conf config.addCliOption("--bootstrap-node", bootstrap) config.addCliOption(StartUpCmd.persistence, "--eth-account", $accounts[running.len]) - config.addCliOption(PersistenceCmd.prover, "--circom-r1cs", "tests/circuits/fixtures/proof_main.r1cs") - config.addCliOption(PersistenceCmd.prover, "--circom-wasm", "tests/circuits/fixtures/proof_main.wasm") - config.addCliOption(PersistenceCmd.prover, "--circom-zkey", "tests/circuits/fixtures/proof_main.zkey") + # TODO: uncomment once PersistenceCmd is added + # config.addCliOption(PersistenceCmd.prover, "--circom-r1cs", "tests/circuits/fixtures/proof_main.r1cs") + # config.addCliOption(PersistenceCmd.prover, "--circom-wasm", "tests/circuits/fixtures/proof_main.wasm") + # config.addCliOption(PersistenceCmd.prover, "--circom-zkey", "tests/circuits/fixtures/proof_main.zkey") return await newCodexProcess(providerIdx, config, Role.Provider)