pass more tests

This commit is contained in:
andri lim 2019-09-09 13:11:09 +07:00 committed by zah
parent 9cba2c9cc0
commit 85b21721b0
3 changed files with 15 additions and 25 deletions

View File

@ -36,10 +36,10 @@ OK: 3/4 Fail: 0/4 Skip: 1/4
## bcForgedTest ## bcForgedTest
```diff ```diff
+ bcForkBlockTest.json OK + bcForkBlockTest.json OK
bcForkUncle.json Skip + bcForkUncle.json OK
+ bcInvalidRLPTest.json OK + bcInvalidRLPTest.json OK
``` ```
OK: 2/3 Fail: 0/3 Skip: 1/3 OK: 3/3 Fail: 0/3 Skip: 0/3
## bcForkStressTest ## bcForkStressTest
```diff ```diff
+ AmIOnEIP150.json OK + AmIOnEIP150.json OK
@ -79,22 +79,22 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
OK: 1/1 Fail: 0/1 Skip: 0/1 OK: 1/1 Fail: 0/1 Skip: 0/1
## bcInvalidHeaderTest ## bcInvalidHeaderTest
```diff ```diff
DifferentExtraData1025.json Skip + DifferentExtraData1025.json OK
DifficultyIsZero.json Skip DifficultyIsZero.json Skip
ExtraData1024.json Skip + ExtraData1024.json OK
ExtraData33.json Skip + ExtraData33.json OK
GasLimitHigherThan2p63m1.json Skip + GasLimitHigherThan2p63m1.json OK
GasLimitIsZero.json Skip + GasLimitIsZero.json OK
log1_wrongBlockNumber.json Skip + log1_wrongBlockNumber.json OK
+ log1_wrongBloom.json OK + log1_wrongBloom.json OK
+ timeDiff0.json OK + timeDiff0.json OK
+ wrongCoinbase.json OK + wrongCoinbase.json OK
wrongDifficulty.json Skip wrongDifficulty.json Skip
wrongGasLimit.json Skip + wrongGasLimit.json OK
wrongGasUsed.json Skip wrongGasUsed.json Skip
wrongMixHash.json Skip wrongMixHash.json Skip
wrongNonce.json Skip wrongNonce.json Skip
wrongNumber.json Skip + wrongNumber.json OK
+ wrongParentHash.json OK + wrongParentHash.json OK
+ wrongParentHash2.json OK + wrongParentHash2.json OK
+ wrongReceiptTrie.json OK + wrongReceiptTrie.json OK
@ -103,7 +103,7 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
+ wrongTransactionsTrie.json OK + wrongTransactionsTrie.json OK
+ wrongUncleHash.json OK + wrongUncleHash.json OK
``` ```
OK: 10/23 Fail: 0/23 Skip: 13/23 OK: 18/23 Fail: 0/23 Skip: 5/23
## bcMultiChainTest ## bcMultiChainTest
```diff ```diff
+ CallContractFromNotBestBlock.json OK + CallContractFromNotBestBlock.json OK
@ -404,4 +404,4 @@ OK: 20/20 Fail: 0/20 Skip: 0/20
OK: 5/5 Fail: 0/5 Skip: 0/5 OK: 5/5 Fail: 0/5 Skip: 0/5
---TOTAL--- ---TOTAL---
OK: 251/318 Fail: 0/318 Skip: 67/318 OK: 260/318 Fail: 0/318 Skip: 58/318

View File

@ -437,8 +437,8 @@ proc importBlock(chainDB: BaseChainDB, preminedBlock: PlainBlock, fork: Fork, ch
result.header.parentHash = parentHeader.hash result.header.parentHash = parentHeader.hash
if validation: if validation:
#if not validateBlockUnchanged(result, preminedBlock): if not validateBlockUnchanged(result, preminedBlock):
#raise newException(ValidationError, "block changed") raise newException(ValidationError, "block changed")
if not validateBlock(chainDB, result, checkSeal): if not validateBlock(chainDB, result, checkSeal):
raise newException(ValidationError, "invalid block") raise newException(ValidationError, "invalid block")

View File

@ -74,27 +74,17 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool =
"randomStatetest76BC.json", "randomStatetest76BC.json",
"randomStatetest79BC.json", "randomStatetest79BC.json",
# bcForgedTest
"bcForkUncle.json",
# bcFrontierToHomestead # bcFrontierToHomestead
"HomesteadOverrideFrontier.json", "HomesteadOverrideFrontier.json",
"blockChainFrontierWithLargerTDvsHomesteadBlockchain.json", "blockChainFrontierWithLargerTDvsHomesteadBlockchain.json",
"blockChainFrontierWithLargerTDvsHomesteadBlockchain2.json", "blockChainFrontierWithLargerTDvsHomesteadBlockchain2.json",
# bcInvalidHeaderTest # bcInvalidHeaderTest
"DifferentExtraData1025.json",
"DifficultyIsZero.json", "DifficultyIsZero.json",
"ExtraData1024.json",
"ExtraData33.json",
"GasLimitHigherThan2p63m1.json",
"GasLimitIsZero.json",
"log1_wrongBlockNumber.json",
"wrongDifficulty.json", "wrongDifficulty.json",
"wrongGasLimit.json",
"wrongGasUsed.json", "wrongGasUsed.json",
"wrongMixHash.json", "wrongMixHash.json",
"wrongNonce.json", "wrongNonce.json",
"wrongNumber.json",
] ]
result = name in allowedFailingGeneralStateTests result = name in allowedFailingGeneralStateTests