diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-02 05:17:13 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:38:48 +0800 |
| commit | e4e36760952287a84f8991df8589c183036383db (patch) | |
| tree | 83c5ba694848232f6d3b01a72dc8c3d94cb9d071 /packages/contracts/test/exchange | |
| parent | 3ed13150e106c19563c8e9b06621be3d44d66b6c (diff) | |
| download | dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.gz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.bz2 dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.lz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.xz dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.zst dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.zip | |
Fixed up after rebasing. Contracts build and tests pass
Diffstat (limited to 'packages/contracts/test/exchange')
| -rw-r--r-- | packages/contracts/test/exchange/core.ts | 4 | ||||
| -rw-r--r-- | packages/contracts/test/exchange/transactions.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 8d3c3a940..53b98c755 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -845,7 +845,7 @@ describe('Exchange core', () => { const makerAssetId = erc721MakerAssetIds[0]; signedOrder = orderFactory.newSignedOrder({ makerAssetAmount: new BigNumber(1), - takerAssetAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18), + takerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(100), 18), makerAssetData: assetProxyUtils.encodeERC721AssetData(erc721Token.address, makerAssetId), takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerAssetAddress), }); @@ -885,7 +885,7 @@ describe('Exchange core', () => { const takerAssetId = erc721TakerAssetIds[0]; signedOrder = orderFactory.newSignedOrder({ takerAssetAmount: new BigNumber(1), - makerAssetAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18), + makerAssetAmount: Web3Wrapper.toBaseUnitAmount(new BigNumber(100), 18), takerAssetData: assetProxyUtils.encodeERC721AssetData(erc721Token.address, takerAssetId), makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerAssetAddress), }); diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index 8c5bc7bec..12390ce01 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -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); }); |