diff options
| author | Greg Hysen <hysz@users.noreply.github.com> | 2018-06-09 02:58:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 02:58:23 +0800 |
| commit | 817c332d11835f02726f0609374d1c25c9ab39b5 (patch) | |
| tree | d84c9a96465b5e862629be3dd04325dcccdbc780 /packages/contracts/test/exchange/transactions.ts | |
| parent | add9a9db9ba4294cf12489bf589c527b0921ed1e (diff) | |
| parent | 05fbc8e6b061e5cef5bb8b8078176f9b375c2ec5 (diff) | |
| download | dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.gz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.bz2 dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.lz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.xz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.zst dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.zip | |
Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom
On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
| -rw-r--r-- | packages/contracts/test/exchange/transactions.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index 7897fa558..12390ce01 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -72,7 +72,7 @@ describe('Exchange transactions', () => { artifacts.Exchange, provider, txDefaults, - assetProxyUtils.encodeERC20ProxyData(zrxToken.address), + assetProxyUtils.encodeERC20AssetData(zrxToken.address), ); exchangeWrapper = new ExchangeWrapper(exchange, provider); await exchangeWrapper.registerAssetProxyAsync(AssetProxyId.ERC20, erc20Proxy.address, owner); @@ -91,8 +91,8 @@ describe('Exchange transactions', () => { exchangeAddress: exchange.address, makerAddress, feeRecipientAddress, - makerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultMakerTokenAddress), - takerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultTakerTokenAddress), + makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerTokenAddress), + takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerTokenAddress), }; makerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)]; takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)]; @@ -224,8 +224,8 @@ describe('Exchange transactions', () => { exchangeAddress: exchange.address, makerAddress, feeRecipientAddress, - makerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultMakerTokenAddress), - takerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultTakerTokenAddress), + makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerTokenAddress), + takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerTokenAddress), }; whitelistOrderFactory = new OrderFactory(makerPrivateKey, defaultOrderParams); }); |