diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-06-13 07:05:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 07:05:46 +0800 |
| commit | 90cf85c3f0712e6714f3297200cf876582e9ec97 (patch) | |
| tree | b79fd5ce4b2eec3ee1d0503066a028e8b2a0556b /packages/contracts/test/exchange/dispatcher.ts | |
| parent | f50d3088dcc7fc7fb88ebfce397684b32aa037aa (diff) | |
| parent | 0917fa0d75b7328c156af2ffafa641ae09286e2e (diff) | |
| download | dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar.gz dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar.bz2 dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar.lz dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar.xz dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.tar.zst dexon-sol-tools-90cf85c3f0712e6714f3297200cf876582e9ec97.zip | |
Merge pull request #682 from 0xProject/feature/contracts/popProxyId
Remove proxyId checks in AssetProxies
Diffstat (limited to 'packages/contracts/test/exchange/dispatcher.ts')
| -rw-r--r-- | packages/contracts/test/exchange/dispatcher.ts | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts index 9e113e47d..abbfd7ac7 100644 --- a/packages/contracts/test/exchange/dispatcher.ts +++ b/packages/contracts/test/exchange/dispatcher.ts @@ -276,12 +276,14 @@ describe('AssetProxyDispatcher', () => { ); // Construct metadata for ERC20 proxy const encodedAssetData = assetProxyUtils.encodeERC20AssetData(zrxToken.address); + const encodedAssetDataWithoutProxyId = encodedAssetData.slice(0, -2); // Perform a transfer from makerAddress to takerAddress const erc20Balances = await erc20Wrapper.getBalancesAsync(); const amount = new BigNumber(10); await web3Wrapper.awaitTransactionSuccessAsync( await assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync( - encodedAssetData, + encodedAssetDataWithoutProxyId, + AssetProxyId.ERC20, makerAddress, takerAddress, amount, @@ -302,11 +304,13 @@ describe('AssetProxyDispatcher', () => { it('should throw if dispatching to unregistered proxy', async () => { // Construct metadata for ERC20 proxy const encodedAssetData = assetProxyUtils.encodeERC20AssetData(zrxToken.address); + const encodedAssetDataWithoutProxyId = encodedAssetData.slice(0, -2); // Perform a transfer from makerAddress to takerAddress const amount = new BigNumber(10); return expectRevertOrAlwaysFailingTransactionAsync( assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync( - encodedAssetData, + encodedAssetDataWithoutProxyId, + AssetProxyId.ERC20, makerAddress, takerAddress, amount, |