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

Updated the exchange tests to use RichErrors

Browse Source
This commit is contained in:
James Towle
2019-06-06 13:44:11 -07:00
committed by Amir Bandeali
parent b3da4bb5b7
commit f4551dd1e5
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/erc1155/test/erc1155_token.ts
View File

@@ -172,12 +172,12 @@ describe('ERC1155Token', () => {
const tokenToTransfer = fungibleToken;
const valueToTransfer = spenderInitialFungibleBalance.plus(1);
// create the expected error (a uint256 underflow)
let expectedError = new SafeMathRevertErrors.Uint256UnderflowError(
const expectedError = new SafeMathRevertErrors.Uint256UnderflowError(
spenderInitialFungibleBalance,
valueToTransfer
valueToTransfer,
);
// execute transfer
let tx = erc1155Contract.safeTransferFrom.sendTransactionAsync(
const tx = erc1155Contract.safeTransferFrom.sendTransactionAsync(
spender,
receiver,
tokenToTransfer,
@@ -347,12 +347,12 @@ describe('ERC1155Token', () => {
const tokensToTransfer = [fungibleToken];
const valuesToTransfer = [spenderInitialFungibleBalance.plus(1)];
// create the expected error (a uint256 underflow)
let expectedError = new SafeMathRevertErrors.Uint256UnderflowError(
const expectedError = new SafeMathRevertErrors.Uint256UnderflowError(
spenderInitialFungibleBalance,
valuesToTransfer
valuesToTransfer[0],
);
// execute transfer
let tx = erc1155Contract.safeBatchTransferFrom.sendTransactionAsync(
const tx = erc1155Contract.safeBatchTransferFrom.sendTransactionAsync(
spender,
receiver,
tokensToTransfer,

8
contracts/exchange/test/dispatcher.ts
View File

@@ -18,7 +18,7 @@ import {
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils, ExchangeRevertErrors } from '@0x/order-utils';
import { AssetProxyId, RevertReason } from '@0x/types';
import { BigNumber } from '@0x/utils';
import { BigNumber, OwnableRevertErrors } from '@0x/utils';
import * as chai from 'chai';
import { LogWithDecodedArgs } from 'ethereum-types';
import * as _ from 'lodash';
@@ -143,10 +143,14 @@ describe('AssetProxyDispatcher', () => {
});
it('should throw if requesting address is not owner', async () => {
const expectedError = new OwnableRevertErrors.OnlyOwnerError(
notOwner,
owner,
);
const tx = assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, {
from: notOwner,
});
return expect(tx).to.revertWith(RevertReason.OnlyContractOwner);
return expect(tx).to.revertWith(expectedError);
});
it('should log an event with correct arguments when an asset proxy is registered', async () => {

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

@@ -12,7 +12,7 @@ import {
} from '@0x/contracts-test-utils';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { Order, RevertReason, SignedOrder } from '@0x/types';
import { BigNumber, providerUtils } from '@0x/utils';
import { BigNumber, SafeMathRevertErrors, providerUtils } from '@0x/utils';
import * as chai from 'chai';
import * as _ from 'lodash';
@@ -51,7 +51,10 @@ const emptySignedOrder: SignedOrder = {
signature: '',
};
const overflowErrorForCall = new Error(RevertReason.Uint256Overflow);
const overflowErrorForCall = (
a?: BigNumber | string | number,
b?: BigNumber | string | number,
) => new SafeMathRevertErrors.Uint256OverflowError(a, b);
describe('Exchange core internal functions', () => {
let chainId: number;
@@ -105,10 +108,10 @@ describe('Exchange core internal functions', () => {
const remainderTimes1000 = remainder.multipliedBy('1000');
const isError = remainderTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(numerator, target);
}
if (remainderTimes1000.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(remainder, '1000');
}
return isError;
}
@@ -133,10 +136,10 @@ describe('Exchange core internal functions', () => {
const errorTimes1000 = error.multipliedBy('1000');
const isError = errorTimes1000.gte(product);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(numerator, target);
}
if (errorTimes1000.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(error, '1000');
}
return isError;
}
@@ -155,7 +158,7 @@ describe('Exchange core internal functions', () => {
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(numerator, target);
}
return product.dividedToIntegerBy(denominator);
}
@@ -189,7 +192,7 @@ describe('Exchange core internal functions', () => {
(totalVal: BigNumber, singleVal: BigNumber) => {
const newTotal = totalVal.plus(singleVal);
if (newTotal.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(totalVal, singleVal);
}
return newTotal;
},
@@ -283,7 +286,7 @@ describe('Exchange core internal functions', () => {
}
const product = numerator.multipliedBy(target);
if (product.isGreaterThan(MAX_UINT256)) {
throw overflowErrorForCall;
throw overflowErrorForCall(numerator, target);
}
return product.dividedToIntegerBy(denominator);
}
@@ -314,7 +317,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;
throw overflowErrorForCall(product, denominator.minus(1));
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {
@@ -371,7 +374,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;
throw overflowErrorForCall(product, denominator.minus(1));
}
const result = offset.dividedToIntegerBy(denominator);
if (product.mod(denominator).eq(0)) {