diff options
| author | Everett Hildenbrandt <hildenb2@illinois.edu> | 2018-05-30 05:52:00 +0800 |
|---|---|---|
| committer | Everett Hildenbrandt <hildenb2@illinois.edu> | 2018-05-31 22:37:30 +0800 |
| commit | ec525a8c13523d3f73f2e63a9e68725a354f1c8d (patch) | |
| tree | b987fa76e72a1910070ee78bfd29fcc6d934707c | |
| parent | e5c12114d6417b44137171588043679bfd6550b0 (diff) | |
| download | dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar.gz dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar.bz2 dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar.lz dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar.xz dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.tar.zst dexon-tests-ec525a8c13523d3f73f2e63a9e68725a354f1c8d.zip | |
JSONSchema/st-filler-schema: fix GeneralStateTests filler schema
| -rw-r--r-- | JSONSchema/st-filler-schema.json | 25 |
1 files changed, 11 insertions, 14 deletions
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 |