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

Fixed the exchange unit tests

Browse Source
This commit is contained in:
James Towle
2019-06-07 17:41:14 -07:00
committed by Amir Bandeali
parent 83bd5f5561
commit fad9dae9bb
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/exchange/test/internal.ts
View File

@@ -50,8 +50,8 @@ const emptySignedOrder: SignedOrder = {
signature: '',
};
const overflowErrorForCall = (a?: BigNumber | number | string, b?: BigNumber | number | string) =>
new SafeMathRevertErrors.Uint256OverflowError(a, b);
const overflowErrorForCall = () =>
new SafeMathRevertErrors.Uint256OverflowError();
describe('Exchange core internal functions', () => {
let chainId: number;
@@ -106,10 +106,10 @@ describe('Exchange core internal functions', () => {
const remainderTimes1000 = remainder.multipliedBy('1000');
const isError = remainderTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(numerator, target);
throw overflowErrorForCall();
}
if (remainderTimes1000.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(remainder, '1000');
throw overflowErrorForCall();
}
return isError;
}
@@ -134,10 +134,10 @@ describe('Exchange core internal functions', () => {
const errorTimes1000 = error.multipliedBy('1000');
const isError = errorTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(numerator, target);
throw overflowErrorForCall();
}
if (errorTimes1000.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(error, '1000');
throw overflowErrorForCall();
}
return isError;
}
@@ -156,7 +156,7 @@ describe('Exchange core internal functions', () => {
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(numerator, target);
throw overflowErrorForCall();
}
return product.dividedToIntegerBy(denominator);
}
@@ -190,7 +190,7 @@ describe('Exchange core internal functions', () => {
(totalVal: BigNumber, singleVal: BigNumber) => {
const newTotal = totalVal.plus(singleVal);
if (newTotal.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(totalVal, singleVal);
throw overflowErrorForCall();
}
return newTotal;
},
@@ -284,7 +284,7 @@ describe('Exchange core internal functions', () => {
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(numerator, target);
throw overflowErrorForCall();
}
return product.dividedToIntegerBy(denominator);
}
@@ -315,7 +315,7 @@ describe('Exchange core internal functions', () => {
const product = numerator.multipliedBy(target);
const offset = product.plus(denominator.minus(1));
if (offset.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(product, denominator.minus(1));
throw overflowErrorForCall();
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {
@@ -372,7 +372,7 @@ describe('Exchange core internal functions', () => {
const product = numerator.multipliedBy(target);
const offset = product.plus(denominator.minus(1));
if (offset.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall(product, denominator.minus(1));
throw overflowErrorForCall();
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {
@@ -446,7 +446,8 @@ describe('Exchange core internal functions', () => {
): Promise<BigNumber> {
const totalFilledAmount = takerAssetFilledAmount.plus(orderTakerAssetFilledAmount);
if (totalFilledAmount.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForSendTransaction(takerAssetFilledAmount, orderTakerAssetFilledAmount);
// FIXME throw overflowErrorForSendTransaction(takerAssetFilledAmount, orderTakerAssetFilledAmount);
throw overflowErrorForSendTransaction();
}
return totalFilledAmount;
}