From ec525a8c13523d3f73f2e63a9e68725a354f1c8d Mon Sep 17 00:00:00 2001
From: Everett Hildenbrandt <hildenb2@illinois.edu>
Date: Tue, 29 May 2018 15:52:00 -0600
Subject: JSONSchema/st-filler-schema: fix GeneralStateTests filler schema

---
 JSONSchema/st-filler-schema.json | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'JSONSchema')

diff --git a/JSONSchema/st-filler-schema.json b/JSONSchema/st-filler-schema.json
index 0e9686aa5..9c810bee1 100644
--- a/JSONSchema/st-filler-schema.json
+++ b/JSONSchema/st-filler-schema.json
@@ -15,12 +15,6 @@
             "type": "object"
         },
         "NullSenderTransaction": {
-            "additionalProperties": true,
-            "not": {
-                "required": [
-                    "secretKey"
-                ]
-            },
             "properties": {
                 "data": {
                     "items": {
@@ -98,12 +92,6 @@
             "type": "object"
         },
         "Transaction": {
-            "additionalProperties": true,
-            "not": {
-                "required": [
-                    "r, s, v"
-                ]
-            },
             "properties": {
                 "data": {
                     "items": {
@@ -123,12 +111,21 @@
                 "nonce": {
                     "$ref": "#/definitions/IntegerOrEmptyOrConfusedHex"
                 },
+                "r": {
+                    "$ref": "#/definitions/TxSigR"
+                },
+                "s": {
+                    "$ref": "#/definitions/TxSigS"
+                },
                 "secretKey": {
                     "$ref": "#/definitions/HexMaybePrefix"
                 },
                 "to": {
                     "$ref": "#/definitions/AddressMaybePrefixOrEmpty"
                 },
+                "v": {
+                    "$ref": "#/definitions/TxSigV"
+                },
                 "value": {
                     "items": {
                         "$ref": "#/definitions/IntegerOrEmptyOrConfusedHex"
@@ -148,7 +145,7 @@
             "type": "object"
         },
         "TxData": {
-            "oneOf": [
+            "anyOf": [
                 {
                     "$ref": "#/definitions/HexData"
                 },
@@ -260,4 +257,4 @@
         }
     },
     "type": "object"
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3