diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-02 00:31:08 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-06-02 00:31:08 +0800 |
commit | 520248e6787a04b2fcf45d7f185d85214a84bfd5 (patch) | |
tree | 81aa132559bb58cce00efd20486e5d994c07236d | |
parent | 0554f947b12f36a1cd5f7be469123e794b467f0b (diff) | |
download | dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar.gz dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar.bz2 dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar.lz dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar.xz dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.tar.zst dexon-sol-tools-520248e6787a04b2fcf45d7f185d85214a84bfd5.zip |
Make validateFillOrder asyncronous
-rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 4 | ||||
-rw-r--r-- | test/exchange_wrapper_test.ts | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index dd3c3c933..dc2c95d4e 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -76,7 +76,7 @@ export class ExchangeWrapper extends ContractWrapper { const senderAddress = await this.web3Wrapper.getSenderAddressOrThrowAsync(); const exchangeInstance = await this.getExchangeContractAsync(); - this.validateFillOrder(signedOrder, fillTakerAmountInBaseUnits, senderAddress); + await this.validateFillOrderAsync(signedOrder, fillTakerAmountInBaseUnits, senderAddress); const orderAddresses: OrderAddresses = [ signedOrder.maker, @@ -120,7 +120,7 @@ export class ExchangeWrapper extends ContractWrapper { ); this.throwErrorLogsAsErrors(response.logs); } - private async validateFillOrder(signedOrder: SignedOrder, fillAmount: BigNumber.BigNumber, senderAddress: string) { + private async validateFillOrderAsync(signedOrder: SignedOrder, fillAmount: BigNumber.BigNumber, senderAddress: string) { if (fillAmount.eq(0)) { throw new Error(FillOrderValidationErrs.FILL_AMOUNT_IS_ZERO); } diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts index 09fb11cb3..2746c9e46 100644 --- a/test/exchange_wrapper_test.ts +++ b/test/exchange_wrapper_test.ts @@ -161,7 +161,8 @@ describe('ExchangeWrapper', () => { makerAmount, addressBySymbol.MLN, takerAmount, addressBySymbol.GNT); zeroEx.setDefaultAccount(taker); const moreThanTheBalance = new BigNumber(6); - expect(zeroEx.exchange.fillOrderAsync(signedOrder, moreThanTheBalance, true)) + const checkTransfer = true; + expect(zeroEx.exchange.fillOrderAsync(signedOrder, moreThanTheBalance, checkTransfer)) .to.be.rejectedWith(FillOrderValidationErrs.NOT_ENOUGH_TAKER_BALANCE); }); }); |