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/libs.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/libs.ts')
-rw-r--r-- | packages/contracts/test/exchange/libs.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/test/exchange/libs.ts b/packages/contracts/test/exchange/libs.ts index b12934014..eff05981d 100644 --- a/packages/contracts/test/exchange/libs.ts +++ b/packages/contracts/test/exchange/libs.ts @@ -38,8 +38,8 @@ describe('Exchange libs', () => { exchangeAddress: libs.address, makerAddress, feeRecipientAddress: addressUtils.generatePseudoRandomAddress(), - makerAssetData: assetProxyUtils.encodeERC20ProxyData(addressUtils.generatePseudoRandomAddress()), - takerAssetData: assetProxyUtils.encodeERC20ProxyData(addressUtils.generatePseudoRandomAddress()), + makerAssetData: assetProxyUtils.encodeERC20AssetData(addressUtils.generatePseudoRandomAddress()), + takerAssetData: assetProxyUtils.encodeERC20AssetData(addressUtils.generatePseudoRandomAddress()), }; const privateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)]; orderFactory = new OrderFactory(privateKey, defaultOrderParams); |