From d116878f170acd38c3329089d3c1357e32213f94 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:25:52 +1100 Subject: [PATCH] fix rebase, formatting --- tests/integration/testcli.nim | 34 +++++++++++++++++-------------- tests/integration/testrestapi.nim | 12 +++++------ tests/testIntegration.nim | 8 ++++---- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/integration/testcli.nim b/tests/integration/testcli.nim index 5360a0ae..8d1878e2 100644 --- a/tests/integration/testcli.nim +++ b/tests/integration/testcli.nim @@ -60,24 +60,28 @@ asyncchecksuite "Command line interface": 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=" & "http://127.0.0.1:" & $HardhatPort, - "prover", - marketplaceArg, - "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs" - ]) + let node = await startCodex( + @[ + "persistence", + "--eth-provider=" & "http://127.0.0.1:" & $HardhatPort, + "prover", + marketplaceArg, + "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs" + ] + ) 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=" & "http://127.0.0.1:" & $HardhatPort, - "prover", - marketplaceArg, - "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", - "--circom-wasm=tests/circuits/fixtures/proof_main.wasm" - ]) + let node = await startCodex( + @[ + "persistence", + "--eth-provider=" & "http://127.0.0.1:" & $HardhatPort, + "prover", + marketplaceArg, + "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", + "--circom-wasm=tests/circuits/fixtures/proof_main.wasm" + ] + ) await node.waitUntilOutput(expectedDownloadInstruction) await node.stop(expectedErrCode = 1) diff --git a/tests/integration/testrestapi.nim b/tests/integration/testrestapi.nim index 9c1ec633..cf92edfb 100644 --- a/tests/integration/testrestapi.nim +++ b/tests/integration/testrestapi.nim @@ -87,7 +87,7 @@ twonodessuite "REST API": var responseBefore = client1.requestStorageRaw( cid, duration, reward, proofProbability, collateral, expiry, nodes.uint, - tolerance.uint, + tolerance.uint ) check responseBefore.status == "400 Bad Request" @@ -108,7 +108,7 @@ twonodessuite "REST API": var responseBefore = client1.requestStorageRaw( cid, duration, reward, proofProbability, collateral, expiry, nodes.uint, - tolerance.uint, + tolerance.uint ) check responseBefore.status == "400 Bad Request" @@ -131,7 +131,7 @@ twonodessuite "REST API": var responseBefore = client1.requestStorageRaw( cid, duration, reward, proofProbability, collateral, expiry, nodes.uint, - tolerance.uint, + tolerance.uint ) check responseBefore.status == "400 Bad Request" @@ -153,7 +153,7 @@ twonodessuite "REST API": var responseBefore = client1.requestStorageRaw( cid, duration, reward, proofProbability, collateral, expiry, nodes.uint, - tolerance.uint, + tolerance.uint ) check responseBefore.status == "200 OK" @@ -200,7 +200,7 @@ twonodessuite "REST API": let headers = newHttpHeaders( { "Content-Type": "text/plain", - "Content-Disposition": "attachment; filename=\"example.txt\"", + "Content-Disposition": "attachment; filename=\"example.txt\"" } ) let uploadResponse = client1.uploadRaw("some file contents", headers) @@ -228,7 +228,7 @@ twonodessuite "REST API": let headers = newHttpHeaders( { "Content-Disposition": "attachment; filename=\"example.txt\"", - "Content-Type": "text/plain", + "Content-Type": "text/plain" } ) diff --git a/tests/testIntegration.nim b/tests/testIntegration.nim index 77a31584..17ba9e28 100644 --- a/tests/testIntegration.nim +++ b/tests/testIntegration.nim @@ -39,7 +39,7 @@ proc run() {.async.} = # Echoes stdout from the integration test file process. Codex process logs can # also be output if a test uses a multinodesuite, requires CodexConfig.debug # to be enabled - const debugCodexNodes = false + const debugCodexNodes = true # Shows test status updates at time intervals. Useful for running locally with # active terminal interaction. Set to false for unattended runs, eg CI. const showContinuousStatusUpdates = true @@ -51,8 +51,8 @@ proc run() {.async.} = fgBlack, styleBright, "\n\n ", styleUnderscore, "ADDITIONAL LOGGING AVAILABILE\n\n", resetStyle, bgWhite, fgBlack, styleBright, """ -More integration test harness logs available by running with --d:chronicles_log_level=TRACE, eg:""", + More integration test harness logs available by running with + -d:chronicles_log_level=TRACE, eg:""", resetStyle, bgWhite, fgBlack, "\n\n nim c -d:chronicles_log_level=TRACE -r ./testIntegration.nim\n\n" @@ -63,7 +63,7 @@ More integration test harness logs available by running with """ For integration test suites that are multinodesuites, or for tests launching a CodexProcess, ensure that CodexConfig.debug - is enabled. + is enabled to see chronicles logs. """ let manager = TestManager.new(