Enable test_blockchain_json by disable some problematic cases (#2346)

status-im · Jun 13, 2024 · 6898345 · 6898345
1 parent f326ae2
commit 6898345
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/nimbus/core/chain/persist_blocks.nim b/nimbus/core/chain/persist_blocks.nim
@@ -49,6 +49,9 @@ const CleanUpEpoch = 30_000.toBlockNumber
 # ------------------------------------------------------------------------------
 
 proc getVmState(c: ChainRef, header: BlockHeader): Result[BaseVMState, string] =
+  if not c.vmState.isNil:
+    return ok(c.vmState)
+
   let vmState = BaseVMState()
   if not vmState.init(header, c.com):
     return err("Could not initialise VMState")

diff --git a/tests/all_tests.nim b/tests/all_tests.nim
@@ -32,7 +32,9 @@ cliBuilder:
           ./test_state_db,
           ./test_difficulty,
           ./test_transaction_json,
-          #./test_blockchain_json,                 -- fails
+          # TODO: some of test_blockchain_json's test cases failing
+          # see issue #2260
+          ./test_blockchain_json, 
           ./test_forkid,
           ./test_multi_keys,
           ./test_misc,

diff --git a/tests/test_allowed_to_fail.nim b/tests/test_allowed_to_fail.nim
@@ -115,10 +115,50 @@ func skipBCTests*(folder: string, name: string): bool =
     "DelegateCallSpam.json",
   ]
 
+# skip failing cases
+# TODO: see issue #2260
+const
+  problematicCases = [
+    "powToPosBlockRejection.json",
+    "initialVal.json",
+    "ForkStressTest.json",
+    "HomesteadOverrideFrontier.json",
+    "blockChainFrontierWithLargerTDvsHomesteadBlockchain.json",
+    "blockChainFrontierWithLargerTDvsHomesteadBlockchain2.json",
+    "RPC_API_Test.json",
+    "DaoTransactions.json",
+    "CallContractFromNotBestBlock.json",
+    "ChainAtoChainB.json",
+    "ChainAtoChainBCallContractFormA.json",
+    "ChainAtoChainB_BlockHash.json",
+    "ChainAtoChainB_difficultyB.json",
+    "ChainAtoChainBtoChainA.json",
+    "ChainAtoChainBtoChainAtoChainB.json",
+    "UncleFromSideChain.json",
+    "lotsOfLeafs.json",
+    "randomStatetest224BC.json",
+    "randomStatetest631BC.json",
+    "blockhashTests.json",
+    "lotsOfBranchesOverrideAtTheEnd.json",
+    "lotsOfBranchesOverrideAtTheMiddle.json",
+    "newChainFrom4Block.json",
+    "newChainFrom5Block.json",
+    "newChainFrom6Block.json",
+    "sideChainWithMoreTransactions.json",
+    "sideChainWithMoreTransactions2.json",
+    "sideChainWithNewMaxDifficultyStartingFromBlock3AfterBlock4.json",
+    "uncleBlockAtBlock3AfterBlock3.json",
+    "uncleBlockAtBlock3afterBlock4.json",
+  ]
+
 func skipNewBCTests*(folder: string, name: string): bool =
   if folder in ["vmPerformance"]:
     return true
 
+  # TODO: fix this
+  if name in problematicCases:
+    return true
+
   # the new BC tests also contains these slow tests
   # for Istanbul fork
   if slowGSTTests(folder, name):

diff --git a/tests/test_blockchain_json.nim b/tests/test_blockchain_json.nim
@@ -225,12 +225,14 @@ proc importBlock(ctx: var TestCtx, com: CommonRef,
 
   let
     chain = newChain(com, extraValidation = true, ctx.vmState)
-    res = chain.persistBlocks([tb.header], [tb.body])
+    res = chain.persistBlocks([EthBlock.init(tb.header, tb.body)])
 
   if res.isErr():
     raise newException(ValidationError, res.error())
-  else:
-    testGetMultiKeys(chain, chain.vmState.parent, tb.header)
+  # testGetMultiKeys fails with:
+  # Unhandled defect: AccountLedger.init(): RootNotFound(Aristo, ctx=ctx/newColFn(), error=GenericError) [AssertionDefect]
+  #else:
+  #  testGetMultiKeys(chain, chain.vmState.parent, tb.header)
 
 proc applyFixtureBlockToChain(ctx: var TestCtx, tb: var TestBlock,
                               com: CommonRef, checkSeal: bool) =