From fb48ef889bf35ec833c91e6d08657f0d5e7f40e6 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:02:20 +1100 Subject: [PATCH] formatting trying to make nph happy --- codex/blockexchange/engine/engine.nim | 6 ++++++ tests/codex/slots/sampler/testutils.nim | 6 ++---- tests/integration/1_minute/testcli.nim | 8 ++++---- tests/integration/codexconfig.nim | 3 ++- tests/integration/multinodes.nim | 6 +++--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/codex/blockexchange/engine/engine.nim b/codex/blockexchange/engine/engine.nim index 0d04fd7f..f5733701 100644 --- a/codex/blockexchange/engine/engine.nim +++ b/codex/blockexchange/engine/engine.nim @@ -68,6 +68,12 @@ const DefaultMaxPeersPerRequest* = 10 DefaultTaskQueueSize = 100 DefaultConcurrentTasks = 10 + # DefaultMaxRetries = 3 + # DefaultConcurrentDiscRequests = 10 + # DefaultConcurrentAdvertRequests = 10 + # DefaultDiscoveryTimeout = 1.minutes + # DefaultMaxQueriedBlocksCache = 1000 + # DefaultMinPeersPerBlock = 3 type TaskHandler* = proc(task: BlockExcPeerCtx): Future[void] {.gcsafe.} diff --git a/tests/codex/slots/sampler/testutils.nim b/tests/codex/slots/sampler/testutils.nim index f20b5efc..5460fde7 100644 --- a/tests/codex/slots/sampler/testutils.nim +++ b/tests/codex/slots/sampler/testutils.nim @@ -77,15 +77,13 @@ asyncchecksuite "Test proof sampler utils": ) proc getExpectedIndices(n: int): seq[Natural] = - return collect( - newSeq, + return collect(newSeq): (; for i in 1 .. n: cellIndex( proofInput.entropy, proofInput.slotRoot, proofInput.nCellsPerSlot, i ) - ), - ) + ) check: slotCellIndices(3) == getExpectedIndices(3) diff --git a/tests/integration/1_minute/testcli.nim b/tests/integration/1_minute/testcli.nim index 1977875c..782fe656 100644 --- a/tests/integration/1_minute/testcli.nim +++ b/tests/integration/1_minute/testcli.nim @@ -21,7 +21,7 @@ asyncchecksuite "Command line interface": args.concat( @[ "--api-port=" & $(await nextFreePort(8080 + nodeCount)), - "--disc-port=" & $(await nextFreePort(8090 + nodeCount)) + "--disc-port=" & $(await nextFreePort(8090 + nodeCount)), ] ), debug = false, @@ -40,7 +40,7 @@ asyncchecksuite "Command line interface": @[ "persistence", "--eth-provider=" & "http://127.0.0.1:" & $HardhatPort, - "--eth-private-key=" & unsafeKeyFile + "--eth-private-key=" & unsafeKeyFile, ] ) await node.waitUntilOutput( @@ -66,7 +66,7 @@ asyncchecksuite "Command line interface": "--eth-provider=" & "http://127.0.0.1:" & $HardhatPort, "prover", marketplaceArg, - "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs" + "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", ] ) await node.waitUntilOutput(expectedDownloadInstruction) @@ -80,7 +80,7 @@ asyncchecksuite "Command line interface": "prover", marketplaceArg, "--circom-r1cs=tests/circuits/fixtures/proof_main.r1cs", - "--circom-wasm=tests/circuits/fixtures/proof_main.wasm" + "--circom-wasm=tests/circuits/fixtures/proof_main.wasm", ] ) await node.waitUntilOutput(expectedDownloadInstruction) diff --git a/tests/integration/codexconfig.nim b/tests/integration/codexconfig.nim index 138ae274..8d0cdb33 100644 --- a/tests/integration/codexconfig.nim +++ b/tests/integration/codexconfig.nim @@ -169,7 +169,8 @@ proc withLogFile*(self: CodexConfigs): CodexConfigs {.raises: [CodexConfigError] proc withLogFile*( self: var CodexConfig, logFile: string -) {.raises: [CodexConfigError].} = #: CodexConfigs = +) {.raises: [CodexConfigError].} = + #: CodexConfigs = ## typically called internally from the test suite, sets a log file path to ## be created during the test run, for a specified node in the group # var config = self diff --git a/tests/integration/multinodes.nim b/tests/integration/multinodes.nim index 49ce3937..37a0758d 100644 --- a/tests/integration/multinodes.nim +++ b/tests/integration/multinodes.nim @@ -218,15 +218,15 @@ template multinodesuite*(name: string, body: untyped) = ) config.addCliOption( PersistenceCmd.prover, "--circom-r1cs", - "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.r1cs" + "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.r1cs", ) config.addCliOption( PersistenceCmd.prover, "--circom-wasm", - "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.wasm" + "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.wasm", ) config.addCliOption( PersistenceCmd.prover, "--circom-zkey", - "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.zkey" + "vendor/codex-contracts-eth/verifier/networks/hardhat/proof_main.zkey", ) return await newCodexProcess(providerIdx, config, Role.Provider)