new format of expected block exceptions in InvalidBlockChain tests

ethereum · Dec 20, 2019 · 062d4f5 · 062d4f5
1 parent 48142b4
commit 062d4f5
Show file tree

Hide file tree

Showing 23 changed files with 101 additions and 62 deletions.
diff --git a/...BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/DifferentExtraData1025Filler.json b/...BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/DifferentExtraData1025Filler.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "ExtraDataTooBig",
                 "blockHeader" : {
                     "extraData" : "0x0101020304050607080910111213141516171819202122232410000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "ExtraDataTooBig"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/DifficultyIsZeroFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/DifficultyIsZeroFiller.json
@@ -44,9 +44,11 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidDifficulty",
                 "blockHeader" : {
-                    "difficulty" : "0"
+                    "difficulty" : "0",
+                    "expectException" : {
+                        "Istanbul" : "InvalidDifficulty"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/ExtraData1024Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/ExtraData1024Filler.json
@@ -44,11 +44,13 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "ExtraDataTooBig",
                 "blockHeader" : {
                     "extraData" : "0x01020304050607080910111213141516171819202122232410000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000100000000000000000002000000000000000000030000000000000000000400000000000000000005000000000000000000060000000000000000000700000000000000000008000000000000000000090000000000000000000100000000000000000001000000000000000000020000000000000000000300000000000000000004000000000000000000050000000000000000000600000000000000000007000000000000000000080000000000000000000900000000000000000001000000000000000000010000000000000000000200000000000000000003000000000000000000040000000000000000000500000000000000000006000000000000000000070000000000000000000800000000000000000009000000000000000000010000000000000000000" ,
-		    "updatePoW" : "1"
-		},
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "ExtraDataTooBig"
+                    }
+                },
                 "transactions" : [
                     {
                         "data" : "",

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/ExtraData33Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/ExtraData33Filler.json
@@ -44,11 +44,13 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "ExtraDataTooBig",
                 "blockHeader" : {
                     "extraData" : "0x010203040506070809101112131415161718192021222324252627282930313233",
-		    "updatePoW" : "1"
-		},
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "ExtraDataTooBig"
+                    }
+                },
                 "transactions" : [
                     {
                         "data" : "",

diff --git a/...ockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/GasLimitHigherThan2p63m1Filler.json b/...ockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/GasLimitHigherThan2p63m1Filler.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidGasLimit",
-		"blockHeader" : {
+                "blockHeader" : {
                     "gasLimit" : "9223372036854775808",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidGasLimit"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/GasLimitIsZeroFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/GasLimitIsZeroFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "TooMuchGasUsed",
                 "blockHeader" : {
                     "gasLimit" : "0",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "TooMuchGasUsed"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/log1_wrongBlockNumberFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/log1_wrongBlockNumberFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidNumber",
                 "blockHeader" : {
                     "number" : "2",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidNumber"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/log1_wrongBloomFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/log1_wrongBloomFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidLogBloom",
                 "blockHeader" : {
                     "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidLogBloom"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/timeDiff0Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/timeDiff0Filler.json
@@ -23,7 +23,7 @@
 		    "network" : [">=Istanbul"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-				"balance" : "5100"
+    				"balance" : "5100"
 			    }
 		    }
 	    }
@@ -59,17 +59,19 @@
                 ]
             },
             {
-		"expectExceptionALL" : "InvalidTimestamp",
                 "blockHeader" : {
                     "RelTimestamp" : "0",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidTimestamp"
+                    }
                 },
                 "transactions" : [
                     {
                         "data" : "",
                         "gasLimit" : "50000",
                         "gasPrice" : "10",
-                        "nonce" : "0",
+                        "nonce" : "1",
                         "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
                         "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "value" : "7000"

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongCoinbaseFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongCoinbaseFiller.json
@@ -44,17 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionFrontier" : "InvalidReceiptsStateRoot",
-		"expectExceptionHomestead" : "InvalidReceiptsStateRoot",
-		"expectExceptionEIP150" : "InvalidReceiptsStateRoot",
-		"expectExceptionEIP158" : "InvalidReceiptsStateRoot",		
-		"expectExceptionByzantium" : "InvalidStateRoot",
-		"expectExceptionConstantinople" : "InvalidStateRoot",
-		"expectExceptionConstantinopleFix" : "InvalidStateRoot",
-		"expectExceptionIstanbul" : "InvalidStateRoot",
                 "blockHeader" : {
                     "coinbase" : "9888f1f195afa192cfee860698584c030f4c9db1",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidStateRoot"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongDifficultyFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongDifficultyFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidDifficulty",
                 "blockHeader" : {
                     "difficulty" : "10000",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidDifficulty"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongGasLimitFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongGasLimitFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidGasLimit",
                 "blockHeader" : {
                     "gasLimit" : "100000",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidGasLimit2"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongGasUsedFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongGasUsedFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidGasUsed",
                 "blockHeader" : {
                     "gasUsed" : "0",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidGasUsed"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongMixHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongMixHashFiller.json
@@ -23,7 +23,7 @@
 		    "network" : [">=Istanbul"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-				"balance" : "100"
+    				"balance" : "100"
 			    }
 		    }
 	    }
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidBlockNonce",
                 "blockHeader" : {
                     "mixHash" : "0xbad81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidBlockMixHash"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongNonceFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongNonceFiller.json
@@ -17,8 +17,8 @@
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-	"sealEngine" : "Ethash",
-	"expect" : [
+        "sealEngine" : "Ethash",
+        "expect" : [
 	    {
 		    "network" : [">=Istanbul"],
 		    "result" : {
@@ -44,9 +44,11 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidBlockNonce",
                 "blockHeader" : {
-                    "nonce" : "0x0102030405060708"
+                    "nonce" : "0x0102030405060708",
+                    "expectException" : {
+                        "Istanbul" : "InvalidBlockNonce"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongNumberFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongNumberFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidNumber",
                 "blockHeader" : {
                     "number" : "0",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidNumber"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongParentHash2Filler.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongParentHash2Filler.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "UnknownParent",
                 "blockHeader" : {
                     "parentHash" : "0x6151889c8f14ab46e32ee0b1894bc276416385d068a1ade000d0dadef9b08b18",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "UnknownParent"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongParentHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongParentHashFiller.json
@@ -23,7 +23,7 @@
 		    "network" : [">=Istanbul"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-				"balance" : "100"
+    				"balance" : "100"
 			    }
 		    }
 	    }
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "UnknownParent",
                 "blockHeader" : {
                     "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "UnknownParent2"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongReceiptTrieFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongReceiptTrieFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidReceiptsStateRoot",
                 "blockHeader" : {
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidReceiptsStateRoot"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongStateRootFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongStateRootFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidStateRoot",
                 "blockHeader" : {
                     "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidStateRoot"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongTimestampFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongTimestampFiller.json
@@ -44,10 +44,12 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidTimestamp",
                 "blockHeader" : {
                     "timestamp" : "0x54c98c80",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1",
+                    "expectException" : {
+                        "Istanbul" : "InvalidTimestamp"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongTransactionsTrieFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongTransactionsTrieFiller.json
@@ -44,9 +44,11 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidTransactionsRoot",
                 "blockHeader" : {
-                    "transactionsTrie" : "0x55e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+                    "transactionsTrie" : "0x55e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "expectException" : {
+                        "Istanbul" : "InvalidTransactionsRoot"
+                    }
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongUncleHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/wrongUncleHashFiller.json
@@ -44,9 +44,11 @@
         },
         "blocks" : [
             {
-		"expectExceptionALL" : "InvalidUnclesHash",
                 "blockHeader" : {
-                    "uncleHash" : "0x0dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "uncleHash" : "0x0dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "expectException" : {
+                        "Istanbul" : "InvalidUnclesHash"
+                    }
                 },
                 "transactions" : [
                     {