diff options
Diffstat (limited to 'packages/dev-utils')
-rw-r--r-- | packages/dev-utils/src/blockchain_lifecycle.ts | 6 | ||||
-rw-r--r-- | packages/dev-utils/src/web3_factory.ts | 2 | ||||
-rw-r--r-- | packages/dev-utils/test/blockchain_lifecycle_test.ts | 2 | ||||
-rw-r--r-- | packages/dev-utils/test/rpc_test.ts | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts index 8e4ad81c7..b9688237d 100644 --- a/packages/dev-utils/src/blockchain_lifecycle.ts +++ b/packages/dev-utils/src/blockchain_lifecycle.ts @@ -1,5 +1,5 @@ import { uniqueVersionIds, Web3Wrapper } from '@0xproject/web3-wrapper'; -import * as _ from 'lodash'; +import { includes } from 'lodash'; import * as Web3 from 'web3'; enum NodeType { @@ -49,9 +49,9 @@ export class BlockchainLifecycle { } private async _getNodeTypeAsync(): Promise<NodeType> { const version = await this._web3Wrapper.getNodeVersionAsync(); - if (_.includes(version, uniqueVersionIds.geth)) { + if (includes(version, uniqueVersionIds.geth)) { return NodeType.Geth; - } else if (_.includes(version, uniqueVersionIds.ganache)) { + } else if (includes(version, uniqueVersionIds.ganache)) { return NodeType.Ganache; } else { throw new Error(`Unknown client version: ${version}`); diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts index 25201228d..47eef4cbd 100644 --- a/packages/dev-utils/src/web3_factory.ts +++ b/packages/dev-utils/src/web3_factory.ts @@ -7,10 +7,8 @@ import ProviderEngine = require('web3-provider-engine'); import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); import { EmptyWalletSubprovider, FakeGasEstimateSubprovider, GanacheSubprovider } from '@0xproject/subproviders'; -import { Provider } from 'ethereum-types'; import * as fs from 'fs'; import * as _ from 'lodash'; -import * as process from 'process'; import { constants } from './constants'; import { env, EnvVars } from './env'; diff --git a/packages/dev-utils/test/blockchain_lifecycle_test.ts b/packages/dev-utils/test/blockchain_lifecycle_test.ts index 3d7d2e0ef..18e245aa3 100644 --- a/packages/dev-utils/test/blockchain_lifecycle_test.ts +++ b/packages/dev-utils/test/blockchain_lifecycle_test.ts @@ -1,6 +1,5 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; -import { BlockParamLiteral } from 'ethereum-types'; import 'make-promises-safe'; import 'mocha'; @@ -18,6 +17,7 @@ describe('BlockchainLifecycle tests', () => { await blockchainLifecycle.startAsync(); await web3Wrapper.mineBlockAsync(); const blockNumberAfter = await web3Wrapper.getBlockNumberAsync(); + // tslint:disable-next-line:restrict-plus-operands expect(blockNumberAfter).to.be.equal(blockNumberBefore + 1); await blockchainLifecycle.revertAsync(); const blockNumberAfterRevert = await web3Wrapper.getBlockNumberAsync(); diff --git a/packages/dev-utils/test/rpc_test.ts b/packages/dev-utils/test/rpc_test.ts index cff946e23..68842ed3a 100644 --- a/packages/dev-utils/test/rpc_test.ts +++ b/packages/dev-utils/test/rpc_test.ts @@ -16,6 +16,7 @@ describe('RPC tests', () => { const blockNumberBefore = await web3Wrapper.getBlockNumberAsync(); await web3Wrapper.mineBlockAsync(); const blockNumberAfter = await web3Wrapper.getBlockNumberAsync(); + // tslint:disable-next-line:restrict-plus-operands expect(blockNumberAfter).to.be.equal(blockNumberBefore + 1); }); }); @@ -26,6 +27,7 @@ describe('RPC tests', () => { await web3Wrapper.increaseTimeAsync(TIME_DELTA); await web3Wrapper.mineBlockAsync(); const blockTimestampAfter = await web3Wrapper.getBlockTimestampAsync(BlockParamLiteral.Latest); + // tslint:disable-next-line:restrict-plus-operands expect(blockTimestampAfter).to.be.at.least(blockTimestampBefore + TIME_DELTA); }); }); |