diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-06-26 07:53:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 07:53:15 +0800 |
| commit | cba92a01b6dee208b497817445b7ae4048e299c0 (patch) | |
| tree | de513c4d4cf75e62488354eb912451c8fb7617ea /packages/contracts/test/exchange/dispatcher.ts | |
| parent | 9341afe764a18c2104e598b25699a30cc1438d8e (diff) | |
| parent | a89908540f8bca266780c59f3cb1521e7fb16b73 (diff) | |
| download | dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar.gz dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar.bz2 dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar.lz dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar.xz dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.tar.zst dexon-sol-tools-cba92a01b6dee208b497817445b7ae4048e299c0.zip | |
Merge pull request #743 from 0xProject/feature/contracts/abi-encoded
ABI encode assetData fields
Diffstat (limited to 'packages/contracts/test/exchange/dispatcher.ts')
| -rw-r--r-- | packages/contracts/test/exchange/dispatcher.ts | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/packages/contracts/test/exchange/dispatcher.ts b/packages/contracts/test/exchange/dispatcher.ts index abbfd7ac7..f96f15f16 100644 --- a/packages/contracts/test/exchange/dispatcher.ts +++ b/packages/contracts/test/exchange/dispatcher.ts @@ -276,14 +276,13 @@ 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( - encodedAssetDataWithoutProxyId, - AssetProxyId.ERC20, + encodedAssetData, makerAddress, takerAddress, amount, @@ -304,13 +303,11 @@ 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( - encodedAssetDataWithoutProxyId, - AssetProxyId.ERC20, + encodedAssetData, makerAddress, takerAddress, amount, |