diff --git a/tests/consensus_spec/bellatrix/test_fixture_operations.nim b/tests/consensus_spec/bellatrix/test_fixture_operations.nim index cec248fb6..b7ec7945b 100644 --- a/tests/consensus_spec/bellatrix/test_fixture_operations.nim +++ b/tests/consensus_spec/bellatrix/test_fixture_operations.nim @@ -126,17 +126,19 @@ suite baseDescription & "Deposit " & preset(): OpDepositsDir, suiteName, "Deposit", "deposit", applyDeposit, path) suite baseDescription & "Execution Payload " & preset(): - for path in walkTests(OpExecutionPayloadDir): - proc applyExecutionPayload( + proc makeApplyExecutionPayloadCb(path: string): auto = + return proc( preState: var bellatrix.BeaconState, body: bellatrix.BeaconBlockBody): Result[void, cstring] = - let payloadValid = - os_ops.readFile(OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml"). - contains("execution_valid: true") + let payloadValid = os_ops.readFile( + OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml" + ).contains("execution_valid: true") func executePayload(_: bellatrix.ExecutionPayload): bool = payloadValid process_execution_payload( preState, body.execution_payload, executePayload) + for path in walkTests(OpExecutionPayloadDir): + let applyExecutionPayload = makeApplyExecutionPayloadCb(path) runTest[bellatrix.BeaconBlockBody, typeof applyExecutionPayload]( OpExecutionPayloadDir, suiteName, "Execution Payload", "body", applyExecutionPayload, path) diff --git a/tests/consensus_spec/capella/test_fixture_operations.nim b/tests/consensus_spec/capella/test_fixture_operations.nim index b5cff97e6..17621de41 100644 --- a/tests/consensus_spec/capella/test_fixture_operations.nim +++ b/tests/consensus_spec/capella/test_fixture_operations.nim @@ -143,17 +143,19 @@ suite baseDescription & "Deposit " & preset(): OpDepositsDir, suiteName, "Deposit", "deposit", applyDeposit, path) suite baseDescription & "Execution Payload " & preset(): - for path in walkTests(OpExecutionPayloadDir): - proc applyExecutionPayload( + proc makeApplyExecutionPayloadCb(path: string): auto = + return proc( preState: var capella.BeaconState, body: capella.BeaconBlockBody): Result[void, cstring] = - let payloadValid = - os_ops.readFile(OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml"). - contains("execution_valid: true") + let payloadValid = os_ops.readFile( + OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml" + ).contains("execution_valid: true") func executePayload(_: capella.ExecutionPayload): bool = payloadValid process_execution_payload( preState, body.execution_payload, executePayload) + for path in walkTests(OpExecutionPayloadDir): + let applyExecutionPayload = makeApplyExecutionPayloadCb(path) runTest[capella.BeaconBlockBody, typeof applyExecutionPayload]( OpExecutionPayloadDir, suiteName, "Execution Payload", "body", applyExecutionPayload, path) diff --git a/tests/consensus_spec/deneb/test_fixture_operations.nim b/tests/consensus_spec/deneb/test_fixture_operations.nim index 7daeceafd..9ef35b03c 100644 --- a/tests/consensus_spec/deneb/test_fixture_operations.nim +++ b/tests/consensus_spec/deneb/test_fixture_operations.nim @@ -146,16 +146,18 @@ suite baseDescription & "Deposit " & preset(): OpDepositsDir, suiteName, "Deposit", "deposit", applyDeposit, path) suite baseDescription & "Execution Payload " & preset(): - for path in walkTests(OpExecutionPayloadDir): - proc applyExecutionPayload( + proc makeApplyExecutionPayloadCb(path: string): auto = + return proc( preState: var deneb.BeaconState, body: deneb.BeaconBlockBody): Result[void, cstring] = - let payloadValid = - os_ops.readFile(OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml"). - contains("execution_valid: true") + let payloadValid = os_ops.readFile( + OpExecutionPayloadDir/"pyspec_tests"/path/"execution.yaml" + ).contains("execution_valid: true") func executePayload(_: deneb.ExecutionPayload): bool = payloadValid process_execution_payload(preState, body, executePayload) + for path in walkTests(OpExecutionPayloadDir): + let applyExecutionPayload = makeApplyExecutionPayloadCb(path) runTest[deneb.BeaconBlockBody, typeof applyExecutionPayload]( OpExecutionPayloadDir, suiteName, "Execution Payload", "body", applyExecutionPayload, path)