From 464c16be73bddce1ed675f642937b164f7add9d8 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 4 Jul 2017 17:33:35 -0700
Subject: move order hash schema to a separate file

---
 src/0x.ts                                 | 3 ++-
 src/contract_wrappers/exchange_wrapper.ts | 3 ++-
 src/schemas/order_schemas.ts              | 6 ------
 src/utils/schema_validator.ts             | 3 ++-
 test/schema_test.ts                       | 3 ++-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/0x.ts b/src/0x.ts
index d790ca38e..49bd31f2d 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -17,7 +17,8 @@ import {ecSignatureSchema} from './schemas/ec_signature_schema';
 import {TokenWrapper} from './contract_wrappers/token_wrapper';
 import {ProxyWrapper} from './contract_wrappers/proxy_wrapper';
 import {ECSignature, ZeroExError, Order, SignedOrder, Web3Provider} from './types';
-import {orderSchema, orderHashSchema} from './schemas/order_schemas';
+import {orderHashSchema} from './schemas/order_hash_schema';
+import {orderSchema} from './schemas/order_schemas';
 import {SchemaValidator} from './utils/schema_validator';
 
 // Customize our BigNumber instances
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 72f00ee91..5a2da4a98 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -45,7 +45,8 @@ import {indexFilterValuesSchema} from '../schemas/index_filter_values_schema';
 import {orderFillRequestsSchema} from '../schemas/order_fill_requests_schema';
 import {orderCancellationRequestsSchema} from '../schemas/order_cancel_schema';
 import {orderFillOrKillRequestsSchema} from '../schemas/order_fill_or_kill_requests_schema';
-import {signedOrderSchema, orderSchema, orderHashSchema} from '../schemas/order_schemas';
+import {orderHashSchema} from '../schemas/order_hash_schema';
+import {signedOrderSchema, orderSchema} from '../schemas/order_schemas';
 import {constants} from '../utils/constants';
 import {TokenWrapper} from './token_wrapper';
 import {decorators} from '../utils/decorators';
diff --git a/src/schemas/order_schemas.ts b/src/schemas/order_schemas.ts
index b5e4a72bb..c346687b5 100644
--- a/src/schemas/order_schemas.ts
+++ b/src/schemas/order_schemas.ts
@@ -25,12 +25,6 @@ export const orderSchema = {
     type: 'object',
 };
 
-export const orderHashSchema = {
-    id: '/orderHashSchema',
-    type: 'string',
-    pattern: '^0x[0-9a-fA-F]{64}$',
-};
-
 export const signedOrderSchema = {
     id: '/signedOrderSchema',
     allOf: [
diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts
index 20c160068..58450ff20 100644
--- a/src/utils/schema_validator.ts
+++ b/src/utils/schema_validator.ts
@@ -1,6 +1,7 @@
 import {Validator, ValidatorResult,  Schema} from 'jsonschema';
 import {ecSignatureSchema, ecSignatureParameterSchema} from '../schemas/ec_signature_schema';
-import {orderSchema, signedOrderSchema, orderHashSchema} from '../schemas/order_schemas';
+import {orderHashSchema} from '../schemas/order_hash_schema';
+import {orderSchema, signedOrderSchema} from '../schemas/order_schemas';
 import {addressSchema, numberSchema} from '../schemas/basic_type_schemas';
 import {tokenSchema} from '../schemas/token_schema';
 import {subscriptionOptsSchema, blockParamSchema} from '../schemas/subscription_opts_schema';
diff --git a/test/schema_test.ts b/test/schema_test.ts
index da7e97ce3..3d1d32d9c 100644
--- a/test/schema_test.ts
+++ b/test/schema_test.ts
@@ -6,7 +6,8 @@ import promisify = require('es6-promisify');
 import {constants} from './utils/constants';
 import {SchemaValidator} from '../src/utils/schema_validator';
 import {tokenSchema} from '../src/schemas/token_schema';
-import {orderSchema, signedOrderSchema, orderHashSchema} from '../src/schemas/order_schemas';
+import {orderHashSchema} from '../src/schemas/order_hash_schema';
+import {orderSchema, signedOrderSchema} from '../src/schemas/order_schemas';
 import {addressSchema, numberSchema} from '../src/schemas/basic_type_schemas';
 import {orderFillOrKillRequestsSchema} from '../src/schemas/order_fill_or_kill_requests_schema';
 import {ecSignatureParameterSchema, ecSignatureSchema} from '../src/schemas/ec_signature_schema';
-- 
cgit v1.2.3