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/dispatcher.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/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, |