From 6c02722f56dd37dd4237248e73d070755f86f318 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 4 Apr 2018 09:50:24 +0900 Subject: Make deployer tests run on inprocess ganache --- packages/deployer/test/deployer_test.ts | 3 ++- packages/deployer/test/util/constants.ts | 1 - packages/deployer/test/util/provider.ts | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 packages/deployer/test/util/provider.ts (limited to 'packages/deployer/test') diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts index 9c34d74aa..eadb535ab 100644 --- a/packages/deployer/test/deployer_test.ts +++ b/packages/deployer/test/deployer_test.ts @@ -8,6 +8,7 @@ import { CompilerOptions, ContractArtifact, ContractNetworkData, DoneCallback } import { constructor_args, exchange_binary } from './fixtures/exchange_bin'; import { constants } from './util/constants'; +import { provider } from './util/provider'; const expect = chai.expect; @@ -26,7 +27,7 @@ describe('#Deployer', () => { const deployerOpts = { artifactsDir, networkId: constants.networkId, - jsonrpcUrl: constants.jsonrpcUrl, + web3Provider: provider, defaults: { gasPrice: constants.gasPrice, }, diff --git a/packages/deployer/test/util/constants.ts b/packages/deployer/test/util/constants.ts index 5385b8d17..b93081a80 100644 --- a/packages/deployer/test/util/constants.ts +++ b/packages/deployer/test/util/constants.ts @@ -2,7 +2,6 @@ import { BigNumber } from '@0xproject/utils'; export const constants = { networkId: 0, - jsonrpcUrl: 'http://localhost:8545', optimizerEnabled: false, gasPrice: new BigNumber(20000000000), timeoutMs: 30000, diff --git a/packages/deployer/test/util/provider.ts b/packages/deployer/test/util/provider.ts new file mode 100644 index 000000000..bc0f55028 --- /dev/null +++ b/packages/deployer/test/util/provider.ts @@ -0,0 +1,6 @@ +import { web3Factory } from '@0xproject/dev-utils'; +import * as Web3 from 'web3'; + +const web3ProviderConfig = { shouldUseInProcessGanache: true }; +const web3Instance = web3Factory.create(web3ProviderConfig); +export const provider = web3Instance.currentProvider; -- cgit v1.2.3 From 75a51af00603236e0b80fe04336494944a32739c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 6 Apr 2018 15:04:17 +0900 Subject: Use provider over web3 in deployer, dev-utils and subprovider tests, rename subprovider to ganacheSubprovider in test util --- packages/deployer/test/deployer_test.ts | 2 +- packages/deployer/test/util/provider.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'packages/deployer/test') diff --git a/packages/deployer/test/deployer_test.ts b/packages/deployer/test/deployer_test.ts index eadb535ab..238624220 100644 --- a/packages/deployer/test/deployer_test.ts +++ b/packages/deployer/test/deployer_test.ts @@ -27,7 +27,7 @@ describe('#Deployer', () => { const deployerOpts = { artifactsDir, networkId: constants.networkId, - web3Provider: provider, + provider, defaults: { gasPrice: constants.gasPrice, }, diff --git a/packages/deployer/test/util/provider.ts b/packages/deployer/test/util/provider.ts index bc0f55028..e0fcb362a 100644 --- a/packages/deployer/test/util/provider.ts +++ b/packages/deployer/test/util/provider.ts @@ -1,6 +1,9 @@ import { web3Factory } from '@0xproject/dev-utils'; +import { Provider } from '@0xproject/types'; import * as Web3 from 'web3'; -const web3ProviderConfig = { shouldUseInProcessGanache: true }; -const web3Instance = web3Factory.create(web3ProviderConfig); -export const provider = web3Instance.currentProvider; +const providerConfigs = { shouldUseInProcessGanache: true }; +const web3Instance = web3Factory.create(providerConfigs); +const provider: Provider = web3Instance.currentProvider; + +export { provider }; -- cgit v1.2.3