From 0b8ddc1ee18c6d52fbc72177e8c5e180f9106708 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 25 May 2017 11:27:27 +0200
Subject: Add schema validation and assertion, create ECSignature schema

---
 src/ts/utils/assert.ts           | 11 ++++++++---
 src/ts/utils/schema_validator.ts | 13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/ts/utils/schema_validator.ts

(limited to 'src/ts/utils')

diff --git a/src/ts/utils/assert.ts b/src/ts/utils/assert.ts
index a29ae922d..7fb51fbdc 100644
--- a/src/ts/utils/assert.ts
+++ b/src/ts/utils/assert.ts
@@ -1,6 +1,7 @@
 import * as _ from 'lodash';
 import * as BigNumber from 'bignumber.js';
 import Web3 = require('web3');
+import {SchemaValidator} from './schema_validator';
 
 export const assert = {
     isBigNumber(variableName: string, value: BigNumber.BigNumber) {
@@ -14,12 +15,16 @@ export const assert = {
         const web3 = new Web3();
         this.assert(web3.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value));
     },
-    isObject(variableName: string, value: object) {
-        this.assert(_.isObject(value), this.typeAssertionMessage(variableName, 'object', value));
-    },
     isNumber(variableName: string, value: number) {
         this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value));
     },
+    doesConformToSchema(variableName: string, value: object, schema: Schema) {
+        const schemaValidator = new SchemaValidator();
+        const validationResult = schemaValidator.validate(value, schema);
+        const hasValidationErrors = validationResult.errors.length > 0;
+        const assertMsg = `Expected ${variableName} to conform to schema ${schema.id}, encountered: $value`;
+        this.assert(!hasValidationErrors, assertMsg);
+    },
     assert(condition: boolean, message: string) {
         if (!condition) {
             throw new Error(message);
diff --git a/src/ts/utils/schema_validator.ts b/src/ts/utils/schema_validator.ts
new file mode 100644
index 000000000..a0d6f1bee
--- /dev/null
+++ b/src/ts/utils/schema_validator.ts
@@ -0,0 +1,13 @@
+import {Validator as V, ValidatorResult} from 'jsonschema';
+import {ECSignatureSchema} from '../schemas/ec_signature_schema';
+
+export class SchemaValidator {
+    private v: V;
+    constructor() {
+        this.v = new V();
+        this.v.addSchema(ECSignatureSchema, ECSignatureSchema.id);
+    }
+    public validate(instance: object, schema: Schema): ValidatorResult {
+        return this.v.validate(instance, schema);
+    }
+}
-- 
cgit v1.2.3