From a3eab71908cd2e188438b4d411b7c426c874f0b2 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <feuGeneA@users.noreply.github.com>
Date: Fri, 28 Dec 2018 15:08:15 -0500
Subject: Correct inconsistencies in JSON schema names

In both ref ID's and file names.
---
 packages/json-schemas/schemas/asset_pairs_request_opts_schema.json | 2 +-
 packages/json-schemas/schemas/call_data_schema.json                | 6 +++---
 packages/json-schemas/schemas/ec_signature_schema.json             | 2 +-
 packages/json-schemas/schemas/js_number.json                       | 5 -----
 packages/json-schemas/schemas/js_number_schema.json                | 5 +++++
 packages/json-schemas/schemas/order_config_request_schema.json     | 2 +-
 packages/json-schemas/schemas/orderbook_request_schema.json        | 4 ++--
 packages/json-schemas/schemas/orders_request_opts_schema.json      | 2 +-
 packages/json-schemas/schemas/paged_request_opts_schema.json       | 2 +-
 packages/json-schemas/schemas/request_opts_schema.json             | 2 +-
 packages/json-schemas/schemas/tx_data_schema.json                  | 6 +++---
 packages/json-schemas/src/schemas.ts                               | 2 +-
 packages/json-schemas/tsconfig.json                                | 2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 packages/json-schemas/schemas/js_number.json
 create mode 100644 packages/json-schemas/schemas/js_number_schema.json

(limited to 'packages')

diff --git a/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
index 174a8fdc3..fad0bd371 100644
--- a/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
+++ b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/AssetPairsRequestOpts",
+    "id": "/AssetPairsRequestOptsSchema",
     "type": "object",
     "properties": {
         "assetDataA": { "$ref": "/hexSchema" },
diff --git a/packages/json-schemas/schemas/call_data_schema.json b/packages/json-schemas/schemas/call_data_schema.json
index c5972e8c1..e5e6e3282 100644
--- a/packages/json-schemas/schemas/call_data_schema.json
+++ b/packages/json-schemas/schemas/call_data_schema.json
@@ -4,13 +4,13 @@
         "from": { "$ref": "/addressSchema" },
         "to": { "$ref": "/addressSchema" },
         "value": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gas": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gasPrice": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "data": {
             "type": "string",
diff --git a/packages/json-schemas/schemas/ec_signature_schema.json b/packages/json-schemas/schemas/ec_signature_schema.json
index bc79ca5e9..52ccfe7bb 100644
--- a/packages/json-schemas/schemas/ec_signature_schema.json
+++ b/packages/json-schemas/schemas/ec_signature_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/ECSignature",
+    "id": "/ecSignatureSchema",
     "properties": {
         "v": {
             "type": "number",
diff --git a/packages/json-schemas/schemas/js_number.json b/packages/json-schemas/schemas/js_number.json
deleted file mode 100644
index 6a72d92c0..000000000
--- a/packages/json-schemas/schemas/js_number.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "/jsNumber",
-    "type": "number",
-    "minimum": 0
-}
diff --git a/packages/json-schemas/schemas/js_number_schema.json b/packages/json-schemas/schemas/js_number_schema.json
new file mode 100644
index 000000000..7df1c4747
--- /dev/null
+++ b/packages/json-schemas/schemas/js_number_schema.json
@@ -0,0 +1,5 @@
+{
+    "id": "/jsNumberSchema",
+    "type": "number",
+    "minimum": 0
+}
diff --git a/packages/json-schemas/schemas/order_config_request_schema.json b/packages/json-schemas/schemas/order_config_request_schema.json
index ca9b2e30e..19b043e7f 100644
--- a/packages/json-schemas/schemas/order_config_request_schema.json
+++ b/packages/json-schemas/schemas/order_config_request_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/OrderConfigRequest",
+    "id": "/OrderConfigRequestSchema",
     "type": "object",
     "properties": {
         "makerAddress": { "$ref": "/addressSchema" },
diff --git a/packages/json-schemas/schemas/orderbook_request_schema.json b/packages/json-schemas/schemas/orderbook_request_schema.json
index 27848bdcb..5ce6e8ab0 100644
--- a/packages/json-schemas/schemas/orderbook_request_schema.json
+++ b/packages/json-schemas/schemas/orderbook_request_schema.json
@@ -1,9 +1,9 @@
 {
-    "id": "/OrderBookRequest",
+    "id": "/OrderbookRequestSchema",
     "type": "object",
     "properties": {
         "baseAssetData": { "$ref": "/hexSchema" },
         "quoteAssetData": { "$ref": "/hexSchema" }
     },
     "required": ["baseAssetData", "quoteAssetData"]
-}
\ No newline at end of file
+}
diff --git a/packages/json-schemas/schemas/orders_request_opts_schema.json b/packages/json-schemas/schemas/orders_request_opts_schema.json
index 10da51060..4c1b9b4e9 100644
--- a/packages/json-schemas/schemas/orders_request_opts_schema.json
+++ b/packages/json-schemas/schemas/orders_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/OrdersRequestOpts",
+    "id": "/OrdersRequestOptsSchema",
     "type": "object",
     "properties": {
         "makerAssetProxyId": { "$ref": "/hexSchema" },
diff --git a/packages/json-schemas/schemas/paged_request_opts_schema.json b/packages/json-schemas/schemas/paged_request_opts_schema.json
index 7cfc73947..f143c28b0 100644
--- a/packages/json-schemas/schemas/paged_request_opts_schema.json
+++ b/packages/json-schemas/schemas/paged_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/PagedRequestOpts",
+    "id": "/PagedRequestOptsSchema",
     "type": "object",
     "properties": {
         "page": { "type": "number" },
diff --git a/packages/json-schemas/schemas/request_opts_schema.json b/packages/json-schemas/schemas/request_opts_schema.json
index b50547d18..2206f5016 100644
--- a/packages/json-schemas/schemas/request_opts_schema.json
+++ b/packages/json-schemas/schemas/request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/RequestOpts",
+    "id": "/RequestOptsSchema",
     "type": "object",
     "properties": {
         "networkId": { "type": "number" }
diff --git a/packages/json-schemas/schemas/tx_data_schema.json b/packages/json-schemas/schemas/tx_data_schema.json
index 4643521ce..8c3daba4e 100644
--- a/packages/json-schemas/schemas/tx_data_schema.json
+++ b/packages/json-schemas/schemas/tx_data_schema.json
@@ -4,13 +4,13 @@
         "from": { "$ref": "/addressSchema" },
         "to": { "$ref": "/addressSchema" },
         "value": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gas": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gasPrice": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "data": {
             "type": "string",
diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 21a6f424c..44673383d 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -8,7 +8,7 @@ import * as ecSignatureSchema from '../schemas/ec_signature_schema.json';
 import * as eip712TypedDataSchema from '../schemas/eip712_typed_data_schema.json';
 import * as hexSchema from '../schemas/hex_schema.json';
 import * as indexFilterValuesSchema from '../schemas/index_filter_values_schema.json';
-import * as jsNumber from '../schemas/js_number.json';
+import * as jsNumber from '../schemas/js_number_schema.json';
 import * as numberSchema from '../schemas/number_schema.json';
 import * as orderCancellationRequestsSchema from '../schemas/order_cancel_schema.json';
 import * as orderConfigRequestSchema from '../schemas/order_config_request_schema.json';
diff --git a/packages/json-schemas/tsconfig.json b/packages/json-schemas/tsconfig.json
index a79d54385..11e68b6fb 100644
--- a/packages/json-schemas/tsconfig.json
+++ b/packages/json-schemas/tsconfig.json
@@ -40,7 +40,7 @@
         "./schemas/relayer_api_orders_schema.json",
         "./schemas/signed_orders_schema.json",
         "./schemas/token_schema.json",
-        "./schemas/js_number.json",
+        "./schemas/js_number_schema.json",
         "./schemas/zero_ex_transaction_schema.json",
         "./schemas/tx_data_schema.json",
         "./schemas/index_filter_values_schema.json",
-- 
cgit v1.2.3