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/asset_proxy/proxies.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/asset_proxy/proxies.ts')
| -rw-r--r-- | packages/contracts/test/asset_proxy/proxies.ts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts index fc1e53352..bf9f9bc3e 100644 --- a/packages/contracts/test/asset_proxy/proxies.ts +++ b/packages/contracts/test/asset_proxy/proxies.ts @@ -17,7 +17,7 @@ import { ERC20ProxyContract } from '../../generated_contract_wrappers/e_r_c20_pr import { ERC721ProxyContract } from '../../generated_contract_wrappers/e_r_c721_proxy'; import { IAssetProxyContract } from '../../generated_contract_wrappers/i_asset_proxy'; 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'; @@ -184,7 +184,7 @@ describe('Asset Transfer Proxies', () => { constants.AWAIT_TRANSACTION_MINED_MS, ); // Perform a transfer; expect this to fail. - return expectRevertReasonOrAlwaysFailingTransactionAsync( + await expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc20Proxy.address, data, @@ -205,7 +205,7 @@ describe('Asset Transfer Proxies', () => { takerAddress, amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + await expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc20Proxy.address, data, @@ -344,7 +344,7 @@ describe('Asset Transfer Proxies', () => { erc20Proxy.address, // the ERC20 proxy does not have an ERC721 receiver amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, data, @@ -369,7 +369,7 @@ describe('Asset Transfer Proxies', () => { takerAddress, amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, data, @@ -393,7 +393,7 @@ describe('Asset Transfer Proxies', () => { takerAddress, amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, data, @@ -421,7 +421,7 @@ describe('Asset Transfer Proxies', () => { takerAddress, amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, data, @@ -442,7 +442,7 @@ describe('Asset Transfer Proxies', () => { takerAddress, amount, ); - return expectRevertReasonOrAlwaysFailingTransactionAsync( + return expectTransactionFailedAsync( web3Wrapper.sendTransactionAsync({ to: erc721Proxy.address, data, |