diff --git a/contracts/exchange/test/balance_stores/local_balance_store.ts b/contracts/exchange/test/balance_stores/local_balance_store.ts index 930075e76c..39f7692000 100644 --- a/contracts/exchange/test/balance_stores/local_balance_store.ts +++ b/contracts/exchange/test/balance_stores/local_balance_store.ts @@ -1,4 +1,4 @@ -import { constants } from '@0x/contracts-test-utils'; +import { constants, Numberish } from '@0x/contracts-test-utils'; import { assetDataUtils } from '@0x/order-utils'; import { AssetProxyId } from '@0x/types'; import { BigNumber } from '@0x/utils'; @@ -37,7 +37,7 @@ export class LocalBalanceStore extends BalanceStore { * @param senderAddress Address whose ETH balance to decrease. * @param amount Amount to decrease the balance by. */ - public burnGas(senderAddress: string, amount: BigNumber | number): void { + public burnGas(senderAddress: string, amount: Numberish): void { this._balances.eth[senderAddress] = this._balances.eth[senderAddress].minus(amount); } @@ -47,7 +47,7 @@ export class LocalBalanceStore extends BalanceStore { * @param toAddress Receiver of ETH. * @param amount Amount of ETH to transfer. */ - public sendEth(fromAddress: string, toAddress: string, amount: BigNumber | number): void { + public sendEth(fromAddress: string, toAddress: string, amount: Numberish): void { this._balances.eth[fromAddress] = this._balances.eth[fromAddress].minus(amount); this._balances.eth[toAddress] = this._balances.eth[toAddress].plus(amount); } diff --git a/contracts/integrations/test/coordinator/coordinator.ts b/contracts/integrations/test/coordinator/coordinator.ts index f1d7dbba52..8ae1f08cc5 100644 --- a/contracts/integrations/test/coordinator/coordinator.ts +++ b/contracts/integrations/test/coordinator/coordinator.ts @@ -251,7 +251,7 @@ blockchainTests.resets('Coordinator tests', env => { transactionHash, feeRecipient.address, ); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); it(`${fnName} should revert with an invalid approval signature`, async () => { const approvalSignature = hexConcat( @@ -272,7 +272,7 @@ blockchainTests.resets('Coordinator tests', env => { transactionHash, feeRecipient.address, ); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); it(`${fnName} should revert if not called by tx signer or approver`, async () => { const tx = coordinator.executeTransaction.awaitTransactionSuccessAsync( @@ -284,7 +284,7 @@ blockchainTests.resets('Coordinator tests', env => { ); const expectedError = new CoordinatorRevertErrors.InvalidOriginError(taker.address); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); } }); @@ -371,7 +371,7 @@ blockchainTests.resets('Coordinator tests', env => { transactionHash, feeRecipient.address, ); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); it(`${fnName} should revert if not called by tx signer or approver`, async () => { const tx = coordinator.executeTransaction.awaitTransactionSuccessAsync( @@ -382,7 +382,7 @@ blockchainTests.resets('Coordinator tests', env => { { from: maker.address, value: DeploymentManager.protocolFee.times(orders.length) }, ); const expectedError = new CoordinatorRevertErrors.InvalidOriginError(taker.address); - expect(tx).to.revertWith(expectedError); + return expect(tx).to.revertWith(expectedError); }); } }); diff --git a/contracts/integrations/test/utils/deployment_manager.ts b/contracts/integrations/test/utils/deployment_manager.ts index 38ff3a85b7..ae3a9ad32a 100644 --- a/contracts/integrations/test/utils/deployment_manager.ts +++ b/contracts/integrations/test/utils/deployment_manager.ts @@ -123,7 +123,7 @@ export interface DeploymentOptions { export class DeploymentManager { public static readonly protocolFeeMultiplier = new BigNumber(150000); - public static readonly gasPrice = new BigNumber(1000000000); // 1 Gwei + public static readonly gasPrice = new BigNumber(1e9); // 1 Gwei public static readonly protocolFee = DeploymentManager.gasPrice.times(DeploymentManager.protocolFeeMultiplier); /**