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

update some RichErrors and @return directives per comments

Browse Source
This commit is contained in:
Michael Zhu
2019-08-20 16:22:11 -07:00
parent 3c169388e2
commit 9f4fe259f9
8 changed files with 134 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,8 +468,13 @@ describe(ContractName.Forwarder, () => {
});
it('should revert if the amount of ETH sent is too low to fill the makerAssetAmount', async () => {
const order = await orderFactory.newSignedOrderAsync();
const revertError = new ForwarderRevertErrors.CompleteFillFailedError();
await forwarderTestFactory.marketBuyTestAsync([order], new BigNumber(0.5), erc20Token, {
const fillFraction = new BigNumber(0.5);
const revertError = new ForwarderRevertErrors.CompleteBuyFailedError(
order.makerAssetAmount.times(fillFraction),
constants.ZERO_AMOUNT,
);
await forwarderTestFactory.marketBuyTestAsync([order], fillFraction, erc20Token, {
ethValueAdjustment: new BigNumber(-2),
revertError,
});
@@ -708,10 +713,22 @@ describe(ContractName.Forwarder, () => {
});
it('should fail if there is not enough ETH remaining to pay the fee', async () => {
const order = await orderFactory.newSignedOrderAsync();
const revertError = new ForwarderRevertErrors.InsufficientEthForFeeError();
const forwarderFeePercentage = new BigNumber(2);
const fillFraction = new BigNumber(0.5);
const ethFee = ForwarderTestFactory.getPercentageOfValue(
order.takerAssetAmount.times(fillFraction),
forwarderFeePercentage,
);
const revertError = new ForwarderRevertErrors.InsufficientEthForFeeError(
ethFee,
ethFee.minus(1),
);
// -2 to compensate for the extra 1 wei added in ForwarderTestFactory to account for rounding
await forwarderTestFactory.marketBuyTestAsync([order], new BigNumber(0.5), erc20Token, {
ethValueAdjustment: new BigNumber(-2),
forwarderFeePercentage: new BigNumber(2),
forwarderFeePercentage,
revertError,
});
});