From 69787ed96a0b0172940d594230aba19f970730c5 Mon Sep 17 00:00:00 2001 From: jangko Date: Wed, 6 Jan 2021 18:47:44 +0700 Subject: [PATCH] fixes test_block_witness --- stateless/test_block_witness.nim | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stateless/test_block_witness.nim b/stateless/test_block_witness.nim index 522ed1c4a..5a7804773 100644 --- a/stateless/test_block_witness.nim +++ b/stateless/test_block_witness.nim @@ -101,12 +101,18 @@ proc testFixtureGST(node: JsonNode, testStatusIMPL: var TestStatus) = fixture["pre"].testBlockWitness(emptyRlpHash, testStatusIMPL) proc blockWitnessMain*(debugMode = false) = + const + legacyGSTFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "GeneralStateTests" + newGSTFolder = "eth_tests" / "GeneralStateTests" + legacyBCFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "BlockchainTests" + newBCFolder = "eth_tests" / "BlockChainTests" + if paramCount() == 0 or not debugMode: # run all test fixtures suite "Block Witness": - jsonTest("newBlockChainTests", "witnessBuilderBC", testFixtureBC) + jsonTest(newBCFolder, "witnessBuilderBC", testFixtureBC) suite "Block Witness": - jsonTest("GeneralStateTests", "witnessBuilderGST", testFixtureGST) + jsonTest(newGSTFolder, "witnessBuilderGST", testFixtureGST) else: # execute single test in debug mode let config = getConfiguration() @@ -114,7 +120,7 @@ proc blockWitnessMain*(debugMode = false) = echo "missing test subject" quit(QuitFailure) - let folder = if config.legacy: "GeneralStateTests" else: "newGeneralStateTests" + let folder = if config.legacy: legacyGSTFolder else: newGSTFolder let path = "tests" / "fixtures" / folder let n = json.parseFile(path / config.testSubject) var testStatusIMPL: TestStatus