From e093864bff4b9e6191d6ed4d7fe8ce9c60c5c367 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Mon, 15 Oct 2018 17:00:48 -0700
Subject: Update json-schemas for contract-wrappers

---
 .../src/schemas/contract_wrappers_config_schema.ts | 22 ++++++++++-
 ...tract_wrappers_private_network_config_schema.ts | 36 ------------------
 ...ntract_wrappers_public_network_config_schema.ts | 44 ----------------------
 3 files changed, 21 insertions(+), 81 deletions(-)
 delete mode 100644 packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
 delete mode 100644 packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts

(limited to 'packages/contract-wrappers/src/schemas')

diff --git a/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
index ac248b2d4..ae1ce668c 100644
--- a/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
+++ b/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
@@ -1,5 +1,25 @@
 export const ContractWrappersConfigSchema = {
     id: '/ContractWrappersConfig',
-    oneOf: [{ $ref: '/ZeroExContractPrivateNetworkConfig' }, { $ref: '/ZeroExContractPublicNetworkConfig' }],
+    properties: {
+        networkId: {
+            type: 'number',
+        },
+        gasPrice: { $ref: '/numberSchema' },
+        contractAddresses: {
+            type: 'object',
+            properties: {
+                erc20Proxy: { $ref: '/addressSchema' },
+                erc721Proxy: { $ref: '/addressSchema' },
+                zrxToken: { $ref: '/addressSchema' },
+                etherToken: { $ref: '/addressSchema' },
+                exchange: { $ref: '/addressSchema' },
+                assetProxyOwner: { $ref: '/addressSchema' },
+                forwarder: { $ref: '/addressSchema' },
+                orderValidator: { $ref: '/addressSchema' },
+            },
+        },
+        blockPollingIntervalMs: { type: 'number' },
+    },
     type: 'object',
+    required: ['networkId'],
 };
diff --git a/packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
deleted file mode 100644
index 904690ae7..000000000
--- a/packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-export const contractWrappersPrivateNetworkConfigSchema = {
-    id: '/ZeroExContractPrivateNetworkConfig',
-    properties: {
-        networkId: {
-            type: 'number',
-            minimum: 1,
-        },
-        gasPrice: { $ref: '/numberSchema' },
-        zrxContractAddress: { $ref: '/addressSchema' },
-        exchangeContractAddress: { $ref: '/addressSchema' },
-        erc20ProxyContractAddress: { $ref: '/addressSchema' },
-        erc721ProxyContractAddress: { $ref: '/addressSchema' },
-        blockPollingIntervalMs: { type: 'number' },
-        orderWatcherConfig: {
-            type: 'object',
-            properties: {
-                pollingIntervalMs: {
-                    type: 'number',
-                    minimum: 0,
-                },
-                numConfirmations: {
-                    type: 'number',
-                    minimum: 0,
-                },
-            },
-        },
-    },
-    type: 'object',
-    required: [
-        'networkId',
-        'zrxContractAddress',
-        'exchangeContractAddress',
-        'erc20ProxyContractAddress',
-        'erc721ProxyContractAddress',
-    ],
-};
diff --git a/packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts
deleted file mode 100644
index 5cd008ae0..000000000
--- a/packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-const networkNameToId: { [networkName: string]: number } = {
-    mainnet: 1,
-    ropsten: 3,
-    rinkeby: 4,
-    kovan: 42,
-    ganache: 50,
-};
-
-export const contractWrappersPublicNetworkConfigSchema = {
-    id: '/ZeroExContractPublicNetworkConfig',
-    properties: {
-        networkId: {
-            type: 'number',
-            enum: [
-                networkNameToId.mainnet,
-                networkNameToId.kovan,
-                networkNameToId.ropsten,
-                networkNameToId.rinkeby,
-                networkNameToId.ganache,
-            ],
-        },
-        gasPrice: { $ref: '/numberSchema' },
-        zrxContractAddress: { $ref: '/addressSchema' },
-        exchangeContractAddress: { $ref: '/addressSchema' },
-        erc20ProxyContractAddress: { $ref: '/addressSchema' },
-        erc721ProxyContractAddress: { $ref: '/addressSchema' },
-        blockPollingIntervalMs: { type: 'number' },
-        orderWatcherConfig: {
-            type: 'object',
-            properties: {
-                pollingIntervalMs: {
-                    type: 'number',
-                    minimum: 0,
-                },
-                numConfirmations: {
-                    type: 'number',
-                    minimum: 0,
-                },
-            },
-        },
-    },
-    type: 'object',
-    required: ['networkId'],
-};
-- 
cgit v1.2.3