From 0baaf1767bd8245af1135d785997ccd800dce950 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Apr 2018 20:01:04 +0900 Subject: Fix merge conflict issues --- packages/contracts/test/exchange/core.ts | 1 - packages/contracts/test/exchange/wrapper.ts | 1 - 2 files changed, 2 deletions(-) (limited to 'packages') diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 13dbcef88..b714fa899 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -86,7 +86,6 @@ describe('Exchange core', () => { erc721TakerAssetIds = erc721Balances[takerAddress][erc721Token.address]; const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [ - assetProxyDispatcher.address, assetProxyUtils.encodeERC20ProxyData(zrxToken.address), ]); exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider); diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index 855c79b56..88e42fee6 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -74,7 +74,6 @@ describe('Exchange wrappers', () => { erc721TakerAssetId = erc721Balances[takerAddress][erc721Token.address][0]; const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [ - assetProxyDispatcher.address, assetProxyUtils.encodeERC20ProxyData(zrxToken.address), ]); exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider); -- cgit v1.2.3