From b1c7291d3cfffb11a13c50a518f2b895bcdc9fc5 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 4 Jul 2017 10:27:31 -0700 Subject: Use orderHashSchema to validate order hash --- src/utils/assert.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/utils/assert.ts') diff --git a/src/utils/assert.ts b/src/utils/assert.ts index 38c1d4aae..ec3790870 100644 --- a/src/utils/assert.ts +++ b/src/utils/assert.ts @@ -45,13 +45,10 @@ export const assert = { isNumber(variableName: string, value: number): void { this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value)); }, - isValidOrderHash(variableName: string, value: string): void { - this.assert(utils.isValidOrderHash(value), this.typeAssertionMessage(variableName, 'orderHash', value)); - }, isBoolean(variableName: string, value: boolean): void { this.assert(_.isBoolean(value), this.typeAssertionMessage(variableName, 'boolean', value)); }, - doesConformToSchema(variableName: string, value: object, schema: Schema): void { + doesConformToSchema(variableName: string, value: any, schema: Schema): void { const schemaValidator = new SchemaValidator(); const validationResult = schemaValidator.validate(value, schema); const hasValidationErrors = validationResult.errors.length > 0; -- cgit v1.2.3 From 40d1d30b5816c9631fd4a0aa9824c6fea0d11bec Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 4 Jul 2017 10:59:11 -0700 Subject: Add assert.doesBelongToStringEnum --- src/utils/assert.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/utils/assert.ts') diff --git a/src/utils/assert.ts b/src/utils/assert.ts index ec3790870..029b69321 100644 --- a/src/utils/assert.ts +++ b/src/utils/assert.ts @@ -5,6 +5,7 @@ import {Web3Wrapper} from '../web3_wrapper'; import {Schema} from 'jsonschema'; import {SchemaValidator} from './schema_validator'; import {utils} from './utils'; +import {StringEnum} from '../types'; const HEX_REGEX = /^0x[0-9A-F]*$/i; @@ -27,6 +28,16 @@ export const assert = { const web3 = new Web3(); this.assert(web3.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value)); }, + doesBelongToStringEnum(variableName: string, value: string, stringEnum: StringEnum): void { + const doesBelongToStringEnum = !_.isUndefined(stringEnum[value]); + const enumValues = _.keys(stringEnum); + const enumValuesAsStrings = _.map(enumValues, enumValue => '\'' + enumValue + '\''); + const enumValuesAsString = enumValuesAsStrings.join(', '); + assert.assert( + doesBelongToStringEnum, + `Expected ${variableName} to be one of: ${enumValuesAsString}, encountered: ${value}`, + ); + }, async isSenderAddressAsync(variableName: string, senderAddressHex: string, web3Wrapper: Web3Wrapper): Promise { assert.isETHAddressHex(variableName, senderAddressHex); -- cgit v1.2.3 From 6f73589d4075ff89717f12c04e28fea7131c40e5 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 4 Jul 2017 17:35:51 -0700 Subject: Use string template --- src/utils/assert.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/utils/assert.ts') diff --git a/src/utils/assert.ts b/src/utils/assert.ts index 029b69321..b3c30c11d 100644 --- a/src/utils/assert.ts +++ b/src/utils/assert.ts @@ -31,7 +31,7 @@ export const assert = { doesBelongToStringEnum(variableName: string, value: string, stringEnum: StringEnum): void { const doesBelongToStringEnum = !_.isUndefined(stringEnum[value]); const enumValues = _.keys(stringEnum); - const enumValuesAsStrings = _.map(enumValues, enumValue => '\'' + enumValue + '\''); + const enumValuesAsStrings = _.map(enumValues, enumValue => `'${enumValue}'`); const enumValuesAsString = enumValuesAsStrings.join(', '); assert.assert( doesBelongToStringEnum, -- cgit v1.2.3