aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-28 02:04:27 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-28 02:04:27 +0800
commit75711f348a09ce666059f76e38e74682463ccaf7 (patch)
tree27934c3bb82c230f2b6d6a1b4cfffaec708bc759
parent56cfb41d54e012864fa9f557a8008f57de6c4267 (diff)
downloaddexon-0x-contracts-75711f348a09ce666059f76e38e74682463ccaf7.tar.gz
dexon-0x-contracts-75711f348a09ce666059f76e38e74682463ccaf7.tar.zst
dexon-0x-contracts-75711f348a09ce666059f76e38e74682463ccaf7.zip
Remove custom Schema type and use one from jsonschema
-rw-r--r--src/globals.d.ts4
-rw-r--r--src/utils/assert.ts1
-rw-r--r--src/utils/schema_validator.ts2
-rw-r--r--yarn.lock12
4 files changed, 6 insertions, 13 deletions
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';
diff --git a/yarn.lock b/yarn.lock
index 94d3ad2db..6c5b8f678 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -42,11 +42,7 @@
version "2.2.41"
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608"
-"@types/node@*":
- version "7.0.23"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.23.tgz#ededfd92e61046c32fcad56ea7e1101733fad4a4"
-
-"@types/node@^8.0.1":
+"@types/node@*", "@types/node@^8.0.1":
version "8.0.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.1.tgz#89c271e0c3b9ebb6a3756dd601336970b6228b77"
@@ -4499,9 +4495,9 @@ web3-provider-engine@~8.1.0:
xhr "^2.2.0"
xtend "^4.0.1"
-web3-typescript-typings@^0.0.9:
- version "0.0.9"
- resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.0.9.tgz#f0c9e9bfcf0effaf16f3498b3d3883686451428b"
+web3-typescript-typings@^0.0.10:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/web3-typescript-typings/-/web3-typescript-typings-0.0.10.tgz#8108c80f252fedb5c1670a547da4554112dbd44d"
dependencies:
bignumber.js "^4.0.2"