From 71be75e0ed5a7e930bcb2fe8aa06ab1ec033fdee Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Jun 2017 10:40:06 +0200 Subject: Convert to JSON schema compatible object by default --- src/utils/schema_validator.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/utils') diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts index 72f6afffa..41c4696d6 100644 --- a/src/utils/schema_validator.ts +++ b/src/utils/schema_validator.ts @@ -11,7 +11,7 @@ export class SchemaValidator { // sub-types (e.g BigNumber) with a simpler string representation. Since BigNumber and other // complex types implement the `toString` method, we can stringify the object and // then parse it. The resultant object can then be checked using jsonschema. - public static convertToJSONSchemaCompatibleObject(obj: any): any { + private static convertToJSONSchemaCompatibleObject(obj: any): any { return JSON.parse(JSON.stringify(obj)); } constructor() { @@ -25,7 +25,8 @@ export class SchemaValidator { this.validator.addSchema(ecSignatureParameter, ecSignatureParameter.id); this.validator.addSchema(orderFillOrKillRequestsSchema, orderFillOrKillRequestsSchema.id); } - public validate(instance: object, schema: Schema): ValidatorResult { - return this.validator.validate(instance, schema); + public validate(instance: any, schema: Schema): ValidatorResult { + const jsonSchemaCompatibleObject = SchemaValidator.convertToJSONSchemaCompatibleObject(instance); + return this.validator.validate(jsonSchemaCompatibleObject, schema); } } -- cgit v1.2.3