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

Updated tests to work with LibMathRichErrors

Browse Source
This commit is contained in:
James Towle 2019-06-11 16:13:43 -07:00 committed by Amir Bandeali
parent 3d58dc2a50
commit e229d2d59f
14 changed files with 73 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/dev-utils/src/artifacts.ts
View File

@ -10,6 +10,6 @@ import * as LibAssetData from '../generated-artifacts/LibAssetData.json';
import * as LibTransactionDecoder from '../generated-artifacts/LibTransactionDecoder.json';
export const artifacts = {
DevUtils: DevUtils as ContractArtifact,
LibTransactionDecoder: LibTransactionDecoder as ContractArtifact,
LibAssetData: LibAssetData as ContractArtifact,
LibTransactionDecoder: LibTransactionDecoder as ContractArtifact,
};

2
contracts/exchange-libs/contracts/src/LibMath.sol
View File

@ -83,7 +83,7 @@ contract LibMath is
_rrevert(DivisionByZeroError());
}
if (_isRoundingErrorFloor(
if (_isRoundingErrorCeil(
numerator,
denominator,
target

1
contracts/exchange/contracts/src/MixinMatchOrders.sol
View File

@ -17,7 +17,6 @@ pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-utils/contracts/src/RichErrors.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "./interfaces/IAssetProxyDispatcher.sol";

2
contracts/exchange/src/artifacts.ts
View File

@ -46,8 +46,8 @@ export const artifacts = {
ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact,
TestExchangeInternals: TestExchangeInternals as ContractArtifact,
TestLibExchangeRichErrorDecoder: TestLibExchangeRichErrorDecoder as ContractArtifact,
TestRevertReceiver: TestRevertReceiver as ContractArtifact,
TestSignatureValidator: TestSignatureValidator as ContractArtifact,
TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
TestLibExchangeRichErrorDecoder: TestLibExchangeRichErrorDecoder as ContractArtifact,
};

16
contracts/exchange/test/core.ts
View File

@ -30,7 +30,7 @@ import {
web3Wrapper,
} from '@0x/contracts-test-utils';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils, ExchangeRevertErrors, orderHashUtils } from '@0x/order-utils';
import { assetDataUtils, ExchangeRevertErrors, LibMathRevertErrors, orderHashUtils } from '@0x/order-utils';
import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
import { BigNumber, providerUtils, StringRevertError } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
@ -598,10 +598,15 @@ describe('Exchange core', () => {
});
const fillTakerAssetAmount2 = new BigNumber(1);
const expectedError = new LibMathRevertErrors.RoundingError(
fillTakerAssetAmount2,
new BigNumber(3),
new BigNumber(1001),
);
const tx = exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, {
takerAssetFillAmount: fillTakerAssetAmount2,
});
return expect(tx).to.revertWith(RevertReason.RoundingError);
return expect(tx).to.revertWith(expectedError);
});
});
@ -817,8 +822,13 @@ describe('Exchange core', () => {
});
// Call Exchange
const takerAssetFillAmount = signedOrder.takerAssetAmount.div(2);
const expectedError = new LibMathRevertErrors.RoundingError(
takerAssetFillAmount,
signedOrder.takerAssetAmount,
signedOrder.makerAssetAmount,
);
const tx = exchangeWrapper.fillOrderAsync(signedOrder, takerAddress, { takerAssetFillAmount });
return expect(tx).to.revertWith(RevertReason.RoundingError);
return expect(tx).to.revertWith(expectedError);
});
});

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

@ -10,6 +10,7 @@ import {
web3Wrapper,
} from '@0x/contracts-test-utils';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { LibMathRevertErrors } from '@0x/order-utils';
import { Order, RevertReason, SignedOrder } from '@0x/types';
import { BigNumber, providerUtils, SafeMathRevertErrors } from '@0x/utils';
import * as chai from 'chai';
@ -50,12 +51,12 @@ const emptySignedOrder: SignedOrder = {
signature: '',
};
const safeMathErrorForCall = () => new SafeMathRevertErrors.SafeMathError();
const safeMathErrorForCall = new SafeMathRevertErrors.SafeMathError();
describe('Exchange core internal functions', () => {
let chainId: number;
let testExchange: TestExchangeInternalsContract;
let safeMathErrorForSendTransaction: () => Error | undefined;
let safeMathErrorForSendTransaction: Error | undefined;
let divisionByZeroErrorForCall: Error | undefined;
let roundingErrorForCall: Error | undefined;
@ -76,9 +77,11 @@ describe('Exchange core internal functions', () => {
txDefaults,
new BigNumber(chainId),
);
safeMathErrorForSendTransaction = safeMathErrorForCall;
divisionByZeroErrorForCall = new Error(RevertReason.DivisionByZero);
roundingErrorForCall = new Error(RevertReason.RoundingError);
safeMathErrorForSendTransaction = safeMathErrorForCall;
divisionByZeroErrorForCall = new LibMathRevertErrors.DivisionByZeroError();
roundingErrorForCall = new LibMathRevertErrors.RoundingError();
});
// Note(albrow): Don't forget to add beforeEach and afterEach calls to reset
// the blockchain state for any tests which modify it!
@ -102,10 +105,10 @@ describe('Exchange core internal functions', () => {
const remainderTimes1000 = remainder.multipliedBy('1000');
const isError = remainderTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
if (remainderTimes1000.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
return isError;
}
@ -130,10 +133,10 @@ describe('Exchange core internal functions', () => {
const errorTimes1000 = error.multipliedBy('1000');
const isError = errorTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
if (errorTimes1000.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
return isError;
}
@ -148,11 +151,11 @@ describe('Exchange core internal functions', () => {
}
const isRoundingError = await referenceIsRoundingErrorFloorAsync(numerator, denominator, target);
if (isRoundingError) {
throw roundingErrorForCall;
throw roundingErrorForCall();
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
return product.dividedToIntegerBy(denominator);
}
@ -186,7 +189,7 @@ describe('Exchange core internal functions', () => {
(totalVal: BigNumber, singleVal: BigNumber) => {
const newTotal = totalVal.plus(singleVal);
if (newTotal.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
return newTotal;
},
@ -280,7 +283,7 @@ describe('Exchange core internal functions', () => {
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
return product.dividedToIntegerBy(denominator);
}
@ -311,7 +314,7 @@ describe('Exchange core internal functions', () => {
const product = numerator.multipliedBy(target);
const offset = product.plus(denominator.minus(1));
if (offset.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {
@ -363,12 +366,12 @@ describe('Exchange core internal functions', () => {
}
const isRoundingError = await referenceIsRoundingErrorCeilAsync(numerator, denominator, target);
if (isRoundingError) {
throw roundingErrorForCall;
throw roundingErrorForCall();
}
const product = numerator.multipliedBy(target);
const offset = product.plus(denominator.minus(1));
if (offset.isGreaterThan(MAX_UINT256)) {
throw safeMathErrorForCall();
throw safeMathErrorForCall;
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {

2
contracts/staking/package.json
View File

@ -34,7 +34,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
},
"config": {
"abis": "generated-artifacts/@(IStaking|Staking).json",
"abis": "./generated-artifacts/@(IStaking|Staking).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
},
"repository": {

2
contracts/staking/src/artifacts.ts
View File

@ -7,4 +7,4 @@ import { ContractArtifact } from 'ethereum-types';
import * as IStaking from '../generated-artifacts/IStaking.json';
import * as Staking from '../generated-artifacts/Staking.json';
export const artifacts = { Staking: Staking as ContractArtifact, IStaking: IStaking as ContractArtifact };
export const artifacts = { IStaking: IStaking as ContractArtifact, Staking: Staking as ContractArtifact };

2
contracts/utils/package.json
View File

@ -34,7 +34,7 @@
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
},
"config": {
"abis": "./generated-artifacts/@(LibAddress|IOwnable|LibBytes|LibEIP712|Ownable|ReentrancyGuard|RichErrors|SafeMath|TestConstants|TestLibAddressArray|TestLibBytes).json",
"abis": "./generated-artifacts/@(IOwnable|LibAddress|LibBytes|LibEIP712|Ownable|ReentrancyGuard|RichErrors|SafeMath|TestConstants|TestLibAddressArray|TestLibBytes).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
},
"repository": {

4
contracts/utils/src/artifacts.ts
View File

@ -19,11 +19,11 @@ import * as TestLibBytes from '../generated-artifacts/TestLibBytes.json';
export const artifacts = {
LibAddress: LibAddress as ContractArtifact,
LibBytes: LibBytes as ContractArtifact,
LibEIP712: LibEIP712 as ContractArtifact,
Ownable: Ownable as ContractArtifact,
ReentrancyGuard: ReentrancyGuard as ContractArtifact,
SafeMath: SafeMath as ContractArtifact,
LibEIP712: LibEIP712 as ContractArtifact,
RichErrors: RichErrors as ContractArtifact,
SafeMath: SafeMath as ContractArtifact,
IOwnable: IOwnable as ContractArtifact,
TestConstants: TestConstants as ContractArtifact,
TestLibAddressArray: TestLibAddressArray as ContractArtifact,

2
contracts/utils/src/wrappers.ts
View File

@ -3,8 +3,8 @@
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
export * from '../generated-wrappers/lib_address';
export * from '../generated-wrappers/i_ownable';
export * from '../generated-wrappers/lib_address';
export * from '../generated-wrappers/lib_bytes';
export * from '../generated-wrappers/lib_e_i_p712';
export * from '../generated-wrappers/ownable';

2
contracts/utils/tsconfig.json
View File

@ -3,8 +3,8 @@
"compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
"include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
"files": [
"generated-artifacts/LibAddress.json",
"generated-artifacts/IOwnable.json",
"generated-artifacts/LibAddress.json",
"generated-artifacts/LibBytes.json",
"generated-artifacts/LibEIP712.json",
"generated-artifacts/Ownable.json",

3
packages/order-utils/src/index.ts
View File

@ -1,4 +1,5 @@
import * as ExchangeRevertErrors from './exchange_revert_errors';
import * as LibMathRevertErrors from './lib_math_revert_errors';
export { orderHashUtils } from './order_hash';
export { signatureUtils } from './signature_utils';
@ -84,4 +85,4 @@ export {
} from './types';
export { ExchangeContract, NetworkId } from '@0x/abi-gen-wrappers';
export { ExchangeRevertErrors };
export { ExchangeRevertErrors, LibMathRevertErrors };

31
packages/order-utils/src/lib_math_revert_errors.ts Normal file
View File

@ -0,0 +1,31 @@
import { BigNumber, RevertError } from '@0x/utils';
import * as _ from 'lodash';
// tslint:disable:max-classes-per-file
export class DivisionByZeroError extends RevertError {
constructor() {
super('DivisionByZeroError', 'DivisionByZeroError()', {});
}
}
export class RoundingError extends RevertError {
constructor(
numerator?: BigNumber | number | string,
denominator?: BigNumber | number | string,
target?: BigNumber | number | string,
) {
super('RoundingError', 'RoundingError(uint256 numerator, uint256 denominator, uint256 target)', {
numerator,
denominator,
target,
});
}
}
const types = [DivisionByZeroError, RoundingError];
// Register the types we've defined.
for (const type of types) {
RevertError.registerType(type);
}