From 75711f348a09ce666059f76e38e74682463ccaf7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 27 Jun 2017 11:04:27 -0700 Subject: Remove custom Schema type and use one from jsonschema --- src/globals.d.ts | 4 ---- src/utils/assert.ts | 1 + src/utils/schema_validator.ts | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/globals.d.ts b/src/globals.d.ts index 4a0a3fb04..6a4e8d3a7 100644 --- a/src/globals.d.ts +++ b/src/globals.d.ts @@ -7,10 +7,6 @@ declare module 'request-promise-native'; declare module 'web3-provider-engine'; declare module 'web3-provider-engine/subproviders/rpc'; -declare interface Schema { - id: string; -} - // HACK: In order to merge the bignumber declaration added by chai-bignumber to the chai Assertion // interface we must use `namespace` as the Chai definitelyTyped definition does. Since we otherwise // disallow `namespace`, we disable tslint for the following. diff --git a/src/utils/assert.ts b/src/utils/assert.ts index 94b119d5a..38c1d4aae 100644 --- a/src/utils/assert.ts +++ b/src/utils/assert.ts @@ -2,6 +2,7 @@ import * as _ from 'lodash'; import * as BigNumber from 'bignumber.js'; import * as Web3 from 'web3'; import {Web3Wrapper} from '../web3_wrapper'; +import {Schema} from 'jsonschema'; import {SchemaValidator} from './schema_validator'; import {utils} from './utils'; diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts index 9097dce88..e3f911adb 100644 --- a/src/utils/schema_validator.ts +++ b/src/utils/schema_validator.ts @@ -1,4 +1,4 @@ -import {Validator, ValidatorResult} from 'jsonschema'; +import {Validator, ValidatorResult, Schema} from 'jsonschema'; import {ecSignatureSchema, ecSignatureParameterSchema} from '../schemas/ec_signature_schema'; import {orderSchema, signedOrderSchema} from '../schemas/order_schemas'; import {addressSchema, numberSchema} from '../schemas/basic_type_schemas'; -- cgit v1.2.3