crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict issues

Browse Source
This commit is contained in:
Fabio Berger
2018-04-24 20:01:04 +09:00
parent eab76c5819
commit 0baaf1767b
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/contracts/test/exchange/core.ts
View File

@@ -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);

1
packages/contracts/test/exchange/wrapper.ts
View File

@@ -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);