3 files changed, 28 insertions, 67 deletions
diff --git a/packages/json-schemas/src/index.ts b/packages/json-schemas/src/index.ts
index b7cae277e..9d8470348 100644
--- a/packages/json-schemas/src/index.ts
+++ b/packages/json-schemas/src/index.ts
@@ -1,4 +1,4 @@
-export {ValidatorResult, Schema} from 'jsonschema';
+export { ValidatorResult, Schema } from 'jsonschema';
 
-export {SchemaValidator} from './schema_validator';
-export {schemas} from './schemas';
+export { SchemaValidator } from './schema_validator';
+export { schemas } from './schemas';
diff --git a/packages/json-schemas/src/schema_validator.ts b/packages/json-schemas/src/schema_validator.ts
index c91f49340..e13326d2a 100644
--- a/packages/json-schemas/src/schema_validator.ts
+++ b/packages/json-schemas/src/schema_validator.ts
@@ -1,18 +1,18 @@
-import {Schema, Validator, ValidatorResult} from 'jsonschema';
+import { Schema, Validator, ValidatorResult } from 'jsonschema';
 import values = require('lodash.values');
 
-import {schemas} from './schemas';
+import { schemas } from './schemas';
 
 export class SchemaValidator {
-    private validator: Validator;
+    private _validator: Validator;
     constructor() {
-        this.validator = new Validator();
+        this._validator = new Validator();
         for (const schema of values(schemas)) {
-            this.validator.addSchema(schema, schema.id);
+            this._validator.addSchema(schema, schema.id);
         }
     }
     public addSchema(schema: Schema) {
-        this.validator.addSchema(schema, schema.id);
+        this._validator.addSchema(schema, schema.id);
     }
     // In order to validate a complex JS object using jsonschema, we must replace any complex
     // sub-types (e.g BigNumber) with a simpler string representation. Since BigNumber and other
@@ -20,7 +20,7 @@ export class SchemaValidator {
     // then parse it. The resultant object can then be checked using jsonschema.
     public validate(instance: any, schema: Schema): ValidatorResult {
         const jsonSchemaCompatibleObject = JSON.parse(JSON.stringify(instance));
-        return this.validator.validate(jsonSchemaCompatibleObject, schema);
+        return this._validator.validate(jsonSchemaCompatibleObject, schema);
     }
     public isValid(instance: any, schema: Schema): boolean {
         const isValid = this.validate(instance, schema).errors.length === 0;
diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 69164cbc7..5cb07acfe 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -1,39 +1,15 @@
-import {
-    addressSchema,
-    numberSchema,
-} from '../schemas/basic_type_schemas';
-import {
-    ecSignatureParameterSchema,
-    ecSignatureSchema,
-} from '../schemas/ec_signature_schema';
-import {
-    indexFilterValuesSchema,
-} from '../schemas/index_filter_values_schema';
-import {
-    orderCancellationRequestsSchema,
-} from '../schemas/order_cancel_schema';
-import {
-    orderFillOrKillRequestsSchema,
-} from '../schemas/order_fill_or_kill_requests_schema';
-import {
-    orderFillRequestsSchema,
-} from '../schemas/order_fill_requests_schema';
-import {
-    orderHashSchema,
-} from '../schemas/order_hash_schema';
-import {
-    orderSchema,
-    signedOrderSchema,
-} from '../schemas/order_schemas';
-import {
-    relayerApiErrorResponseSchema,
-} from '../schemas/relayer_api_error_response_schema';
-import {
-    relayerApiFeesPayloadSchema,
-} from '../schemas/relayer_api_fees_payload_schema';
-import {
-    relayerApiFeesResponseSchema,
-} from '../schemas/relayer_api_fees_response_schema';
+import { addressSchema, numberSchema } from '../schemas/basic_type_schemas';
+import { blockParamSchema, blockRangeSchema } from '../schemas/block_range_schema';
+import { ecSignatureParameterSchema, ecSignatureSchema } from '../schemas/ec_signature_schema';
+import { indexFilterValuesSchema } from '../schemas/index_filter_values_schema';
+import { orderCancellationRequestsSchema } from '../schemas/order_cancel_schema';
+import { orderFillOrKillRequestsSchema } from '../schemas/order_fill_or_kill_requests_schema';
+import { orderFillRequestsSchema } from '../schemas/order_fill_requests_schema';
+import { orderHashSchema } from '../schemas/order_hash_schema';
+import { orderSchema, signedOrderSchema } from '../schemas/order_schemas';
+import { relayerApiErrorResponseSchema } from '../schemas/relayer_api_error_response_schema';
+import { relayerApiFeesPayloadSchema } from '../schemas/relayer_api_fees_payload_schema';
+import { relayerApiFeesResponseSchema } from '../schemas/relayer_api_fees_response_schema';
 import {
     relayerApiOrderbookChannelSubscribePayload,
     relayerApiOrderbookChannelSubscribeSchema,
@@ -42,30 +18,15 @@ import {
     relayerApiOrderbookChannelSnapshotPayload,
     relayerApiOrderbookChannelSnapshotSchema,
 } from '../schemas/relayer_api_orderbook_channel_snapshot_schema';
-import {
-    relayerApiOrderbookChannelUpdateSchema,
-} from '../schemas/relayer_api_orderbook_channel_update_response_schema';
-import {
-    relayerApiOrderBookResponseSchema,
-} from '../schemas/relayer_api_orderbook_response_schema';
+import { relayerApiOrderbookChannelUpdateSchema } from '../schemas/relayer_api_orderbook_channel_update_response_schema';
+import { relayerApiOrderBookResponseSchema } from '../schemas/relayer_api_orderbook_response_schema';
 import {
     relayerApiTokenPairsResponseSchema,
     relayerApiTokenTradeInfoSchema,
 } from '../schemas/relayer_api_token_pairs_response_schema';
-import {
-    signedOrdersSchema,
-} from '../schemas/signed_orders_schema';
-import {
-    blockParamSchema,
-    subscriptionOptsSchema,
-} from '../schemas/subscription_opts_schema';
-import {
-    tokenSchema,
-} from '../schemas/token_schema';
-import {
-    jsNumber,
-    txDataSchema,
-} from '../schemas/tx_data_schema';
+import { signedOrdersSchema } from '../schemas/signed_orders_schema';
+import { tokenSchema } from '../schemas/token_schema';
+import { jsNumber, txDataSchema } from '../schemas/tx_data_schema';
 
 export const schemas = {
     numberSchema,
@@ -81,7 +42,7 @@ export const schemas = {
     signedOrderSchema,
     signedOrdersSchema,
     blockParamSchema,
-    subscriptionOptsSchema,
+    blockRangeSchema,
     tokenSchema,
     jsNumber,
     txDataSchema,