diff options
Diffstat (limited to 'src/ts/utils')
-rw-r--r-- | src/ts/utils/assert.ts | 21 | ||||
-rw-r--r-- | src/ts/utils/constants.ts | 2 | ||||
-rw-r--r-- | src/ts/utils/utils.ts | 9 |
3 files changed, 20 insertions, 12 deletions
diff --git a/src/ts/utils/assert.ts b/src/ts/utils/assert.ts index 2f52c6a3b..1baf572d1 100644 --- a/src/ts/utils/assert.ts +++ b/src/ts/utils/assert.ts @@ -1,30 +1,33 @@ import * as _ from 'lodash'; import * as BigNumber from 'bignumber.js'; -import Web3 = require('web3'); +import * as Web3 from 'web3'; import {SchemaValidator} from './schema_validator'; const HEX_REGEX = /^0x[0-9A-F]*$/i; export const assert = { - isBigNumber(variableName: string, value: BigNumber.BigNumber) { + isBigNumber(variableName: string, value: BigNumber.BigNumber): void { const isBigNumber = _.isObject(value) && value.isBigNumber; this.assert(isBigNumber, this.typeAssertionMessage(variableName, 'BigNumber', value)); }, - isString(variableName: string, value: string) { + isUndefined(value: any, variableName?: string): void { + this.assert(_.isUndefined(value), this.typeAssertionMessage(variableName, 'undefined', value)); + }, + isString(variableName: string, value: string): void { this.assert(_.isString(value), this.typeAssertionMessage(variableName, 'string', value)); }, - isHexString(variableName: string, value: string) { + isHexString(variableName: string, value: string): void { this.assert(_.isString(value) && HEX_REGEX.test(value), this.typeAssertionMessage(variableName, 'HexString', value)); }, - isETHAddressHex(variableName: string, value: string) { + isETHAddressHex(variableName: string, value: string): void { const web3 = new Web3(); this.assert(web3.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value)); }, - isNumber(variableName: string, value: number) { + isNumber(variableName: string, value: number): void { this.assert(_.isFinite(value), this.typeAssertionMessage(variableName, 'number', value)); }, - doesConformToSchema(variableName: string, value: object, schema: Schema) { + doesConformToSchema(variableName: string, value: object, schema: Schema): void { const schemaValidator = new SchemaValidator(); const validationResult = schemaValidator.validate(value, schema); const hasValidationErrors = validationResult.errors.length > 0; @@ -33,12 +36,12 @@ Encountered: ${JSON.stringify(value, null, '\t')} Validation errors: ${validationResult.errors.join(', ')}`; this.assert(!hasValidationErrors, msg); }, - assert(condition: boolean, message: string) { + assert(condition: boolean, message: string): void { if (!condition) { throw new Error(message); } }, - typeAssertionMessage(variableName: string, type: string, value: any) { + typeAssertionMessage(variableName: string, type: string, value: any): string { return `Expected ${variableName} to be of type ${type}, encountered: ${value}`; }, }; diff --git a/src/ts/utils/constants.ts b/src/ts/utils/constants.ts index 60af7b674..ec2fe744a 100644 --- a/src/ts/utils/constants.ts +++ b/src/ts/utils/constants.ts @@ -1,3 +1,3 @@ export const constants = { NULL_ADDRESS: '0x0000000000000000000000000000000000000000', -} +}; diff --git a/src/ts/utils/utils.ts b/src/ts/utils/utils.ts index bde1e7aba..b514b702d 100644 --- a/src/ts/utils/utils.ts +++ b/src/ts/utils/utils.ts @@ -3,11 +3,16 @@ import * as BN from 'bn.js'; export const utils = { /** * Converts BigNumber instance to BN - * The only we convert to BN is to remain compatible with `ethABI. soliditySHA3 ` that - * expects values of Solidity type `uint` to be of type `BN`. + * The only reason we convert to BN is to remain compatible with `ethABI. soliditySHA3` that + * expects values of Solidity type `uint` to be passed as type `BN`. * We do not use BN anywhere else in the codebase. */ bigNumberToBN(value: BigNumber.BigNumber) { return new BN(value.toString(), 10); }, + consoleLog(message: string): void { + /* tslint:disable */ + console.log(message); + /* tslint:enable */ + }, }; |