From b7adf59ed5f06ba8c9186340b091d3847f44458c Mon Sep 17 00:00:00 2001 From: James Towle Date: Fri, 7 Jun 2019 15:02:44 -0700 Subject: [PATCH] Fixed any lingering style issues --- contracts/erc1155/test/erc1155_token.ts | 8 ++++---- contracts/exchange/test/dispatcher.ts | 2 +- contracts/exchange/test/internal.ts | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/contracts/erc1155/test/erc1155_token.ts b/contracts/erc1155/test/erc1155_token.ts index 9776f52820..5d27578a4b 100644 --- a/contracts/erc1155/test/erc1155_token.ts +++ b/contracts/erc1155/test/erc1155_token.ts @@ -173,7 +173,7 @@ describe('ERC1155Token', () => { const valueToTransfer = spenderInitialFungibleBalance.plus(1); // create the expected error (a uint256 underflow) const expectedError = new SafeMathRevertErrors.Uint256UnderflowError( - spenderInitialFungibleBalance, + spenderInitialFungibleBalance, valueToTransfer, ); // execute transfer @@ -185,7 +185,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); it('should throw if callback reverts', async () => { // setup test parameters @@ -349,7 +349,7 @@ describe('ERC1155Token', () => { // create the expected error (a uint256 underflow) const expectedError = new SafeMathRevertErrors.Uint256UnderflowError( - spenderInitialFungibleBalance, + spenderInitialFungibleBalance, valuesToTransfer[0], ); // execute transfer @@ -361,7 +361,7 @@ describe('ERC1155Token', () => { receiverCallbackData, { from: spender }, ); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); it('should throw if callback reverts', async () => { // setup test parameters diff --git a/contracts/exchange/test/dispatcher.ts b/contracts/exchange/test/dispatcher.ts index 5208a42da4..0b68eb17ad 100644 --- a/contracts/exchange/test/dispatcher.ts +++ b/contracts/exchange/test/dispatcher.ts @@ -17,7 +17,7 @@ import { } from '@0x/contracts-test-utils'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils, ExchangeRevertErrors } from '@0x/order-utils'; -import { AssetProxyId, RevertReason } from '@0x/types'; +import { AssetProxyId } from '@0x/types'; import { BigNumber, OwnableRevertErrors } from '@0x/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; diff --git a/contracts/exchange/test/internal.ts b/contracts/exchange/test/internal.ts index 5ce2a0e627..f79454559d 100644 --- a/contracts/exchange/test/internal.ts +++ b/contracts/exchange/test/internal.ts @@ -3,7 +3,6 @@ import { chaiSetup, constants, FillResults, - getRevertReasonOrErrorMessageForSendTransactionAsync, provider, testCombinatoriallyWithReferenceFuncAsync, txDefaults, @@ -12,7 +11,7 @@ import { } from '@0x/contracts-test-utils'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { Order, RevertReason, SignedOrder } from '@0x/types'; -import { BigNumber, SafeMathRevertErrors, providerUtils } from '@0x/utils'; +import { BigNumber, providerUtils, SafeMathRevertErrors } from '@0x/utils'; import * as chai from 'chai'; import * as _ from 'lodash';