diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-07-04 18:07:05 +0800 |
|---|---|---|
| committer | Jacob Evans <jacob@dekz.net> | 2018-07-04 18:29:54 +0800 |
| commit | 5915f8430c252a341cac9c5ef645836efd4d7e92 (patch) | |
| tree | 2d973f3b39d19247855a6320cc48858f0011df40 /packages/contracts/test/exchange/wrapper.ts | |
| parent | 9e0f06d06055022fff80bbf7a8b6444f72f898ec (diff) | |
| parent | aeea3817a48473aec0eb378b0ad6cbe7e7877044 (diff) | |
| download | dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.gz dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.bz2 dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.lz dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.xz dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.tar.zst dexon-sol-tools-5915f8430c252a341cac9c5ef645836efd4d7e92.zip | |
Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final
Diffstat (limited to 'packages/contracts/test/exchange/wrapper.ts')
| -rw-r--r-- | packages/contracts/test/exchange/wrapper.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index 7942f7695..69f374e46 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -12,7 +12,7 @@ import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_pr import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy'; import { ExchangeContract } from '../../generated_contract_wrappers/exchange'; import { artifacts } from '../utils/artifacts'; -import { expectRevertReasonOrAlwaysFailingTransactionAsync } from '../utils/assertions'; +import { expectTransactionFailedAsync } from '../utils/assertions'; import { chaiSetup } from '../utils/chai_setup'; import { constants } from '../utils/constants'; import { ERC20Wrapper } from '../utils/erc20_wrapper'; @@ -174,7 +174,7 @@ describe('Exchange wrappers', () => { expirationTimeSeconds: new BigNumber(Math.floor((Date.now() - 10000) / 1000)), }); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( exchangeWrapper.fillOrKillOrderAsync(signedOrder, takerAddress), RevertReason.OrderUnfillable, ); @@ -187,7 +187,7 @@ describe('Exchange wrappers', () => { takerAssetFillAmount: signedOrder.takerAssetAmount.div(2), }); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( exchangeWrapper.fillOrKillOrderAsync(signedOrder, takerAddress), RevertReason.CompleteFillFailed, ); @@ -500,7 +500,7 @@ describe('Exchange wrappers', () => { await exchangeWrapper.fillOrKillOrderAsync(signedOrders[0], takerAddress); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( exchangeWrapper.batchFillOrKillOrdersAsync(signedOrders, takerAddress, { takerAssetFillAmounts, }), @@ -703,7 +703,7 @@ describe('Exchange wrappers', () => { orderFactory.newSignedOrder(), ]; - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( exchangeWrapper.marketSellOrdersAsync(signedOrders, takerAddress, { takerAssetFillAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(1000), 18), }), @@ -921,7 +921,7 @@ describe('Exchange wrappers', () => { orderFactory.newSignedOrder(), ]; - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( exchangeWrapper.marketBuyOrdersAsync(signedOrders, takerAddress, { makerAssetFillAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(1000), 18), }), |