diff options
| author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-07-04 04:42:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 04:42:30 +0800 |
| commit | d91b30faef0e53072757dfd5fea86db10dcf838f (patch) | |
| tree | 5c48b7bdcec58668656d11e10cc3d8bee7680dac /packages/contracts/test/asset_proxy/proxies.ts | |
| parent | 9b864517e2402d766b285098040787c62dfcd99d (diff) | |
| parent | dc956020ef7c6d3f1880263700422b31253c8da3 (diff) | |
| download | dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar.gz dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar.bz2 dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar.lz dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar.xz dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.tar.zst dexon-sol-tools-d91b30faef0e53072757dfd5fea86db10dcf838f.zip | |
Merge pull request #812 from 0xProject/fix/revert-assertions-improvements
Improve robustness of revert reason assertions
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, |