From f75595c6cd2a3edebca37d7d0063538116844074 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 25 May 2017 20:12:55 +0200 Subject: Change the order of params in isValidSignatureAsync to be consistent --- src/ts/contract_wrappers/exchange_wrapper.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ts/contract_wrappers/exchange_wrapper.ts b/src/ts/contract_wrappers/exchange_wrapper.ts index 502a1089b..5a576a7fa 100644 --- a/src/ts/contract_wrappers/exchange_wrapper.ts +++ b/src/ts/contract_wrappers/exchange_wrapper.ts @@ -3,17 +3,17 @@ import {Web3Wrapper} from '../web3_wrapper'; import {ECSignature, ZeroExError, ExchangeContract} from '../types'; import {assert} from '../utils/assert'; import {ContractWrapper} from './contract_wrapper'; -import * as ExchangeArtifacts from '../artifacts/Exchange.json'; +import * as ExchangeArtifacts from '../../artifacts/Exchange.json'; import {ECSignatureSchema} from '../schemas/ec_signature_schema'; export class ExchangeWrapper extends ContractWrapper { constructor(web3Wrapper: Web3Wrapper) { super(web3Wrapper); } - public async isValidSignatureAsync(maker: string, ecSignature: ECSignature, dataHex: string) { - assert.isString('maker', maker); - assert.doesConformToSchema('ecSignature', ecSignature, ECSignatureSchema); + public async isValidSignatureAsync(dataHex: string, ecSignature: ECSignature, maker: string) { assert.isHexString('dataHex', dataHex); + assert.doesConformToSchema('ecSignature', ecSignature, ECSignatureSchema); + assert.isString('maker', maker); const senderAddressIfExists = this.web3Wrapper.getSenderAddressIfExistsAsync(); assert.assert(!_.isUndefined(senderAddressIfExists), ZeroExError.USER_HAS_NO_ASSOCIATED_ADDRESSES); -- cgit v1.2.3