update json schema for invalid blockchain tests

ethereum · Jan 10, 2020 · 64a0df4 · 64a0df4
1 parent 2948f43
commit 64a0df4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 226 deletions.
diff --git a/JSONSchema/bc-filler-schema.json b/JSONSchema/bc-filler-schema.json
@@ -1,17 +1,5 @@
 {
     "definitions": {
-	"BlockchainExpectSection": {
-	    "additionalProperties": false,
-            "properties": {
-		    "network": {
-		            "$ref": "#/definitions/Networks"
-		        },
-		    "result": {
-		            "$ref": "#/definitions/AccountMap"
-		        }
-	     },
-	    "type": "array"
-	},
         "BadHexData": {
             "pattern": "^0x[0-9a-zA-Z]*$",
             "type": "string"
@@ -91,6 +79,9 @@
                 "difficulty": {
                     "$ref": "#/definitions/IntegerOrConfusedHex"
                 },
+                "expectException": {
+                    "type": "object"
+                },
                 "extraData": {
                     "$ref": "#/definitions/HexMaybePrefixOrEmpty"
                 },
@@ -129,6 +120,9 @@
                 },
                 "uncleHash": {
                     "$ref": "#/definitions/IntegerOrConfusedHex"
+                },
+                "updatePow": {
+                    "$ref": "#/definitions/IntegerOrConfusedHex"
                 }
             }
         },
@@ -148,6 +142,18 @@
                 }
             }
         },
+        "BlockchainExpectSection": {
+            "additionalProperties": false,
+            "properties": {
+                "network": {
+                    "$ref": "#/definitions/Networks"
+                },
+                "result": {
+                    "$ref": "#/definitions/AccountMap"
+                }
+            },
+            "type": "array"
+        },
         "NullSenderTransaction": {
             "additionalProperties": true,
             "not": {
@@ -236,9 +242,6 @@
             ],
             "type": "object"
         },
-	"sealEngine": {
-	    "$ref": "#/definitions/SealEngineType"
-	},
         "Transaction": {
             "additionalProperties": true,
             "not": {
@@ -320,6 +323,9 @@
                     ]
                 }
             ]
+        },
+        "sealEngine": {
+            "$ref": "#/definitions/SealEngineType"
         }
     },
     "patternProperties": {
@@ -331,25 +337,25 @@
                     },
                     "type": "array"
                 },
-		"network": {
-		    "type": "string"
-		},
                 "expect": {
-		    "oneOf": [
+                    "oneOf": [
                         {
                             "$ref": "#/definitions/AccountMap"
                         },
                         {
                             "$ref": "#/definitions/BlockchainExpectSection"
                         }
-                     ]                 
+                    ]
                 },
                 "genesisBlockHeader": {
                     "$ref": "#/definitions/BlockHeader"
                 },
                 "genesisRLP": {
                     "$ref": "#/definitions/ConfusedHexType"
                 },
+                "network": {
+                    "type": "string"
+                },
                 "pre": {
                     "patternProperties": {
                         "^0x[0-9a-f]*": {
@@ -358,9 +364,9 @@
                         }
                     }
                 },
-		"sealEngine": {
-		    "$ref": "#/definitions/SealEngineType"
-		}
+                "sealEngine": {
+                    "$ref": "#/definitions/SealEngineType"
+                }
             },
             "required": [
                 "pre",

diff --git a/JSONSchema/bc-schema.json b/JSONSchema/bc-schema.json
@@ -22,6 +22,9 @@
                 "comment": {
                     "type": "string"
                 },
+                "expectException": {
+                    "type": "string"
+                },
                 "expectExceptionALL": {
                     "type": "string"
                 },

diff --git a/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp4Filler.json b/...kchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp4Filler.json
@@ -76,7 +76,7 @@
             {
                 "blockHeader" : {
                     "uncleHash" : "0xbd1aca7ed975e1b827350c9e167f19b7b28fb3d55339e51082e4327bc318fb5a",
-                    "stateRoot" : "0xdd6283d3d1cdb05ccb389b62ae449408dddcba54fd27d8fed4e5295875ba46f7",
+                    "stateRoot" : "0xdd6283d3d1cdb05ccb389b62ae449408dddcba54fd27d8fed4e5295875ba46f7"
                 },
                 "transactions" : [
                     {

diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/remove/nonceWrongFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/remove/nonceWrongFiller.json
diff --git a/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/remove/wrongMixHashFiller.json b/src/BlockchainTestsFiller/InvalidBlocks/bcUncleHeaderValidity/remove/wrongMixHashFiller.json