From fea1020f4591dffcf043e99b7bf9326e0fb53dcb Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Fri, 1 Jun 2018 00:30:43 -0600 Subject: JSONSchema/*.json: format files --- JSONSchema/bc-filler-schema.json | 18 ++++++++---------- JSONSchema/bc-schema.json | 2 +- JSONSchema/definitions.json | 28 ++++++++++++++-------------- JSONSchema/st-schema.json | 2 +- JSONSchema/vm-filler-schema.json | 2 +- JSONSchema/vm-schema.json | 2 +- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/JSONSchema/bc-filler-schema.json b/JSONSchema/bc-filler-schema.json index d3c8f9d6d..7705463e3 100644 --- a/JSONSchema/bc-filler-schema.json +++ b/JSONSchema/bc-filler-schema.json @@ -13,9 +13,7 @@ "blockHeader": { "$ref": "#/definitions/BlockHeader" }, - "blockHeaderPremine": { - - }, + "blockHeaderPremine": {}, "blocknumber": { "$ref": "#/definitions/IntegerOrEmptyOrConfusedHex" }, @@ -299,12 +297,6 @@ }, "type": "array" }, - "genesisBlockHeader": { - "$ref": "#/definitions/BlockHeader" - }, - "genesisRLP": { - "$ref": "#/definitions/ConfusedHexType" - }, "expect": { "patternProperties": { "^0x[0-9a-f]*": { @@ -313,6 +305,12 @@ } } }, + "genesisBlockHeader": { + "$ref": "#/definitions/BlockHeader" + }, + "genesisRLP": { + "$ref": "#/definitions/ConfusedHexType" + }, "pre": { "patternProperties": { "^0x[0-9a-f]*": { @@ -330,4 +328,4 @@ "type": "object" } } -} +} \ No newline at end of file diff --git a/JSONSchema/bc-schema.json b/JSONSchema/bc-schema.json index 729638d1a..365dde623 100644 --- a/JSONSchema/bc-schema.json +++ b/JSONSchema/bc-schema.json @@ -314,4 +314,4 @@ "type": "object" } } -} +} \ No newline at end of file diff --git a/JSONSchema/definitions.json b/JSONSchema/definitions.json index 45088f2bb..b2040cf29 100644 --- a/JSONSchema/definitions.json +++ b/JSONSchema/definitions.json @@ -111,6 +111,19 @@ "pattern": "(^0x0$)|(^0x[1-9a-fA-F][0-9a-fA-F]*$)", "type": "string" }, + "Indices": { + "anyOf": [ + { + "type": "array" + }, + { + "type": "string" + }, + { + "type": "number" + } + ] + }, "Info": { "description": "Information block for filled tests.", "properties": { @@ -135,19 +148,6 @@ "sourceHash" ] }, - "Indices": { - "anyOf": [ - { - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - } - ] - }, "IntegerOrConfusedHex": { "anyOf": [ { @@ -317,4 +317,4 @@ "type": "array" } } -} +} \ No newline at end of file diff --git a/JSONSchema/st-schema.json b/JSONSchema/st-schema.json index fa4ad181a..cf0f02f6b 100644 --- a/JSONSchema/st-schema.json +++ b/JSONSchema/st-schema.json @@ -258,4 +258,4 @@ } }, "type": "object" -} +} \ No newline at end of file diff --git a/JSONSchema/vm-filler-schema.json b/JSONSchema/vm-filler-schema.json index fe61ae86a..a8863352d 100644 --- a/JSONSchema/vm-filler-schema.json +++ b/JSONSchema/vm-filler-schema.json @@ -159,4 +159,4 @@ } }, "type": "object" -} +} \ No newline at end of file diff --git a/JSONSchema/vm-schema.json b/JSONSchema/vm-schema.json index f88b92a2e..ab3a91729 100644 --- a/JSONSchema/vm-schema.json +++ b/JSONSchema/vm-schema.json @@ -138,4 +138,4 @@ } }, "type": "object" -} +} \ No newline at end of file -- cgit