aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-04-24 19:01:04 +0800
committerFabio Berger <me@fabioberger.com>2018-04-24 19:01:04 +0800
commit0baaf1767bd8245af1135d785997ccd800dce950 (patch)
tree218fa5e1f6d7167c164be5a3c9fe2205de88fa2b /packages
parenteab76c58197b9bb26cb21d115accba2f0df2dd51 (diff)
downloaddexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar.gz
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar.bz2
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar.lz
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar.xz
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.tar.zst
dexon-sol-tools-0baaf1767bd8245af1135d785997ccd800dce950.zip
Fix merge conflict issues
Diffstat (limited to 'packages')
-rw-r--r--packages/contracts/test/exchange/core.ts1
-rw-r--r--packages/contracts/test/exchange/wrapper.ts1
2 files changed, 0 insertions, 2 deletions
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);