logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-04-18 02:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify error handling in suggestDownloadTool and enhance test setup for CLI

Browse Source
This commit is contained in:
Dmitriy Ryajov 2025-05-30 18:25:06 -06:00 committed by Eric
parent 160d9b85a8
commit 481845a9b2
No known key found for this signature in database
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codex/slots/proofs/proverfactory.nim
View File

@ -71,9 +71,7 @@ proc getZkeyFile*(config: CodexConf): ?!string =
proc suggestDownloadTool(config: CodexConf) =
without address =? config.marketplaceAddress:
raise (ref Defect)(
msg: "Proving backend initializing while marketplace address not set."
)
raiseAssert("Proving backend initializing while marketplace address not set.")
let
tokens = ["cirdl", "\"" & $config.circuitDir & "\"", config.ethProvider, $address]

64
tests/integration/testcli.nim
View File

@ -1,5 +1,7 @@
import std/tempfiles
import std/times
import std/appdirs
import std/paths
import codex/conf
import codex/utils/fileutils
import ../asynctest
@ -65,8 +67,11 @@ asyncchecksuite "Command line interface":
test "complains when persistence is enabled without ethereum account":
let node = await startCodex(@["persistence"])
defer:
await node.stop(expectedErrCode = 1)
await node.waitUntilOutput("Persistence enabled, but no Ethereum account was set")
await node.stop(expectedErrCode = 1)
test "complains when ethereum private key file has wrong permissions":
let unsafeKeyFile = genTempPath("", "")
@ -78,45 +83,66 @@ asyncchecksuite "Command line interface":
"--eth-private-key=" & unsafeKeyFile,
]
)
defer:
await node.stop(expectedErrCode = 1)
discard removeFile(unsafeKeyFile)
await node.waitUntilOutput(
"Ethereum private key file does not have safe file permissions"
)
await node.stop(expectedErrCode = 1)
discard removeFile(unsafeKeyFile)
let
marketplaceArg = "--marketplace-address=" & $EthAddress.example
expectedDownloadInstruction =
"Proving circuit files are not found. Please run the following to download them:"
let expectedDownloadInstruction =
"Proving circuit files are not found. Please run the following to download them:"
test "suggests downloading of circuit files when persistence is enabled without accessible r1cs file":
let node = await startCodex(@["persistence", "prover", marketplaceArg])
await node.waitUntilOutput(expectedDownloadInstruction)
await node.stop(expectedErrCode = 1)
test "suggests downloading of circuit files when persistence is enabled without accessible wasm file":
let node = await startCodex(
@[
"persistence",
"--eth-provider=" & "ws://localhost:" & $HardhatPort,
"prover",
marketplaceArg,
"--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs",
"--marketplace-address=" & $EthAddress.example,
"--prover-backend=nimgroth16",
]
)
defer:
await node.stop(expectedErrCode = 1)
await node.waitUntilOutput(expectedDownloadInstruction)
await node.stop(expectedErrCode = 1)
test "suggests downloading of circuit files when persistence is enabled without accessible zkey file":
let node = await startCodex(
@[
"persistence",
"--eth-provider=" & "ws://localhost:" & $HardhatPort,
"prover",
marketplaceArg,
"--marketplace-address=" & $EthAddress.example,
"--prover-backend=nimgroth16",
"--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs",
"--circom-wasm=tests/circuits/fixtures/proof_main.wasm",
]
)
defer:
await node.stop(expectedErrCode = 1)
await node.waitUntilOutput(expectedDownloadInstruction)
test "suggests downloading of circuit files when persistence is enabled without accessible graph file":
let node = await startCodex(
@[
"persistence",
"--eth-provider=" & "ws://localhost:" & $HardhatPort,
"prover",
"--marketplace-address=" & $EthAddress.example,
"--prover-backend=nimgroth16",
"--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs",
"--circom-zkey=tests/circuits/fixtures/proof_main.zkey",
]
)
defer:
await node.stop(expectedErrCode = 1)
await node.waitUntilOutput(expectedDownloadInstruction)
await node.stop(expectedErrCode = 1)