diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-07-04 05:43:23 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-07-04 05:43:23 +0800 |
commit | 52c956222e8a737c05bae49a97e457df81933000 (patch) | |
tree | 8f9cec16388d872fbabf61c33d8717daefb88344 /packages/contracts/test/exchange/dispatcher.ts | |
parent | 9389d643924316a18ac8503211d39bb4ebf2156b (diff) | |
parent | 0900e0c85e76a34301ad5a336d2b195ed595aef7 (diff) | |
download | dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar.gz dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar.bz2 dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar.lz dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar.xz dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.tar.zst dexon-sol-tools-52c956222e8a737c05bae49a97e457df81933000.zip |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/portal-mobile-improvements
Diffstat (limited to 'packages/contracts/test/exchange/dispatcher.ts')
-rw-r--r-- | packages/contracts/test/exchange/dispatcher.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts index afbf958d9..94ada1ef2 100644 --- a/packages/contracts/test/exchange/dispatcher.ts +++ b/packages/contracts/test/exchange/dispatcher.ts @@ -14,7 +14,7 @@ import { TestAssetProxyDispatcherContract, } from '../../generated_contract_wrappers/test_asset_proxy_dispatcher'; 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'; @@ -129,7 +129,7 @@ describe('AssetProxyDispatcher', () => { txDefaults, ); // Register new ERC20 Transfer Proxy contract - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(newErc20TransferProxy.address, { from: owner, }), @@ -138,7 +138,7 @@ describe('AssetProxyDispatcher', () => { }); it('should throw if requesting address is not owner', async () => { - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, { from: notOwner }), RevertReason.OnlyContractOwner, ); @@ -210,7 +210,7 @@ describe('AssetProxyDispatcher', () => { const encodedAssetData = assetProxyUtils.encodeERC20AssetData(zrxToken.address); // Perform a transfer from makerAddress to takerAddress const amount = new BigNumber(10); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync( encodedAssetData, makerAddress, |