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

rmeove maker asset equality check; update to reflect removal of weth asset proxy

Browse Source
This commit is contained in:
Michael Zhu
2019-10-01 13:02:47 -07:00
parent b01de802cb
commit 0ff8b12770
6 changed files with 12 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
contracts/exchange-forwarder/test/forwarder.ts
View File

@@ -119,15 +119,12 @@ blockchainTests(ContractName.Forwarder, env => {
env.txDefaults,
{},
wethContract.address,
erc20Proxy.address,
);
await exchangeContract.setProtocolFeeMultiplier.awaitTransactionSuccessAsync(PROTOCOL_FEE_MULTIPLIER);
await exchangeContract.setProtocolFeeCollectorAddress.awaitTransactionSuccessAsync(
protocolFeeCollector.address,
);
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(protocolFeeCollector.address, {
from: owner,
});
erc20Wrapper.addTokenOwnerAddress(protocolFeeCollector.address);
// Set defaults
defaultMakerAssetAddress = erc20Token.address;
@@ -157,7 +154,9 @@ blockchainTests(ContractName.Forwarder, env => {
wethAssetData,
);
forwarderWrapper = new ForwarderWrapper(forwarderContract, env.provider);
await forwarderWrapper.approveMakerAssetProxyAsync(defaultOrderParams.makerAssetData, { from: takerAddress });
await forwarderWrapper.approveMakerAssetProxyAsync(assetDataUtils.encodeERC20AssetData(erc20Token.address), {
from: takerAddress,
});
erc20Wrapper.addTokenOwnerAddress(forwarderContract.address);
// Set up factories
@@ -311,27 +310,6 @@ blockchainTests(ContractName.Forwarder, env => {
expect(takerEthBalanceAfter).to.be.bignumber.equal(takerEthBalanceBefore.minus(totalEthSpent));
});
it('should fail to fill orders with mismatched makerAssetData', async () => {
const firstOrderMakerAssetData = assetDataUtils.encodeERC20AssetData(erc20Token.address);
const firstOrder = await orderFactory.newSignedOrderAsync({
makerAssetData: firstOrderMakerAssetData,
});
const secondOrderMakerAssetData = assetDataUtils.encodeERC20AssetData(secondErc20Token.address);
const secondOrder = await orderFactory.newSignedOrderAsync({
makerAssetData: secondOrderMakerAssetData,
});
const orders = [firstOrder, secondOrder];
const revertError = new ForwarderRevertErrors.MakerAssetMismatchError(
firstOrderMakerAssetData,
secondOrderMakerAssetData,
);
await forwarderTestFactory.marketSellTestAsync(orders, 2, erc20Token, {
revertError,
});
});
it('should fail to fill an order with a fee denominated in an asset other than makerAsset or WETH', async () => {
const makerAssetData = assetDataUtils.encodeERC20AssetData(erc20Token.address);
const takerFeeAssetData = assetDataUtils.encodeERC20AssetData(secondErc20Token.address);