From 1668a085049d3b065c47709ef0018a66f637b992 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 1 Jun 2017 14:59:03 +0200
Subject: rename signed_order_schema to order_schemas

---
 src/0x.js.ts                              |  2 +-
 src/contract_wrappers/exchange_wrapper.ts |  2 +-
 src/schemas/order_schemas.ts              | 50 +++++++++++++++++++++++++++++++
 src/schemas/signed_order_schema.ts        | 50 -------------------------------
 src/utils/schema_validator.ts             |  2 +-
 5 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 src/schemas/order_schemas.ts
 delete mode 100644 src/schemas/signed_order_schema.ts

diff --git a/src/0x.js.ts b/src/0x.js.ts
index 92a5d2c54..bf56d5f8d 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -18,7 +18,7 @@ import {ecSignatureSchema} from './schemas/ec_signature_schema';
 import {TokenWrapper} from './contract_wrappers/token_wrapper';
 import {SolidityTypes, ECSignature, ZeroExError} from './types';
 import {Order} from './types';
-import {orderSchema} from './schemas/signed_order_schema';
+import {orderSchema} from './schemas/order_schemas';
 
 // Customize our BigNumber instances
 bigNumberConfigs.configure();
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 59e6c755e..ad2573c6b 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -13,7 +13,7 @@ import {assert} from '../utils/assert';
 import {ContractWrapper} from './contract_wrapper';
 import * as ExchangeArtifacts from '../artifacts/Exchange.json';
 import {ecSignatureSchema} from '../schemas/ec_signature_schema';
-import {signedOrderSchema} from '../schemas/signed_order_schema';
+import {signedOrderSchema} from '../schemas/order_schemas';
 import {SchemaValidator} from '../utils/schema_validator';
 import {ContractResponse} from '../types';
 import {constants} from '../utils/constants';
diff --git a/src/schemas/order_schemas.ts b/src/schemas/order_schemas.ts
new file mode 100644
index 000000000..dc7e51e40
--- /dev/null
+++ b/src/schemas/order_schemas.ts
@@ -0,0 +1,50 @@
+export const addressSchema = {
+    id: '/addressSchema',
+    type: 'string',
+    pattern: '^0[xX][0-9A-Fa-f]{40}$',
+};
+
+export const numberSchema = {
+    id: '/numberSchema',
+    type: 'string',
+    format: '\d+(\.\d+)?',
+};
+
+export const orderSchema = {
+    id: '/orderSchema',
+    properties: {
+        maker: {$ref: '/addressSchema'},
+        taker: {$ref: '/addressSchema'},
+
+        makerFee: {$ref: '/numberSchema'},
+        takerFee: {$ref: '/numberSchema'},
+
+        makerTokenAmount: {$ref: '/numberSchema'},
+        takerTokenAmount: {$ref: '/numberSchema'},
+
+        makerTokenAddress: {$ref: '/addressSchema'},
+        takerTokenAddress: {$ref: '/addressSchema'},
+
+        salt: {$ref: '/numberSchema'},
+        feeRecipient: {$ref: '/addressSchema'},
+        expirationUnixTimestampSec: {$ref: '/numberSchema'},
+    },
+    required: [
+        'maker', /*'taker',*/ 'makerFee', 'takerFee', 'makerTokenAmount', 'takerTokenAmount',
+        'salt', 'feeRecipient', 'expirationUnixTimestampSec',
+    ],
+    type: 'object',
+};
+
+export const signedOrderSchema = {
+    id: '/signedOrderSchema',
+    allOf: [
+        { $ref: '/orderSchema' },
+        {
+            properties: {
+                ecSignature: {$ref: '/ECSignature'},
+            },
+            required: ['ecSignature'],
+        },
+    ],
+};
diff --git a/src/schemas/signed_order_schema.ts b/src/schemas/signed_order_schema.ts
deleted file mode 100644
index dc7e51e40..000000000
--- a/src/schemas/signed_order_schema.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-export const addressSchema = {
-    id: '/addressSchema',
-    type: 'string',
-    pattern: '^0[xX][0-9A-Fa-f]{40}$',
-};
-
-export const numberSchema = {
-    id: '/numberSchema',
-    type: 'string',
-    format: '\d+(\.\d+)?',
-};
-
-export const orderSchema = {
-    id: '/orderSchema',
-    properties: {
-        maker: {$ref: '/addressSchema'},
-        taker: {$ref: '/addressSchema'},
-
-        makerFee: {$ref: '/numberSchema'},
-        takerFee: {$ref: '/numberSchema'},
-
-        makerTokenAmount: {$ref: '/numberSchema'},
-        takerTokenAmount: {$ref: '/numberSchema'},
-
-        makerTokenAddress: {$ref: '/addressSchema'},
-        takerTokenAddress: {$ref: '/addressSchema'},
-
-        salt: {$ref: '/numberSchema'},
-        feeRecipient: {$ref: '/addressSchema'},
-        expirationUnixTimestampSec: {$ref: '/numberSchema'},
-    },
-    required: [
-        'maker', /*'taker',*/ 'makerFee', 'takerFee', 'makerTokenAmount', 'takerTokenAmount',
-        'salt', 'feeRecipient', 'expirationUnixTimestampSec',
-    ],
-    type: 'object',
-};
-
-export const signedOrderSchema = {
-    id: '/signedOrderSchema',
-    allOf: [
-        { $ref: '/orderSchema' },
-        {
-            properties: {
-                ecSignature: {$ref: '/ECSignature'},
-            },
-            required: ['ecSignature'],
-        },
-    ],
-};
diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts
index 9ff7259d9..db8a960ba 100644
--- a/src/utils/schema_validator.ts
+++ b/src/utils/schema_validator.ts
@@ -1,6 +1,6 @@
 import {Validator, ValidatorResult} from 'jsonschema';
 import {ecSignatureSchema, ecSignatureParameter} from '../schemas/ec_signature_schema';
-import {addressSchema, numberSchema, orderSchema, signedOrderSchema} from '../schemas/signed_order_schema';
+import {addressSchema, numberSchema, orderSchema, signedOrderSchema} from '../schemas/order_schemas';
 import {tokenSchema} from '../schemas/token_schema';
 
 export class SchemaValidator {
-- 
cgit v1.2.3