From c5afca53a4e94b51956f10f564c2e9db00012c8f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Mar 2018 15:39:50 +0100 Subject: Rename COVERAGE to SOLIDITY_COVERAGS --- packages/contracts/package.json | 2 +- packages/contracts/test/global_hooks.ts | 2 +- packages/dev-utils/CHANGELOG.md | 2 +- packages/dev-utils/src/web3_factory.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 8f353d1a6..ba0b52e90 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -13,7 +13,7 @@ "copy_artifacts": "copyfiles './src/artifacts/**/*' ./lib", "build": "tsc", "test": "run-s build run_mocha", - "test:coverage": "COVERAGE=true run-s build run_mocha coverage:report:text", + "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir src/artifacts", diff --git a/packages/contracts/test/global_hooks.ts b/packages/contracts/test/global_hooks.ts index 670ac3bdf..b29e171d7 100644 --- a/packages/contracts/test/global_hooks.ts +++ b/packages/contracts/test/global_hooks.ts @@ -1,7 +1,7 @@ import { getCoverageSubproviderSingleton } from '@0xproject/dev-utils'; after('generate coverage report', async () => { - if (process.env.COVERAGE) { + if (process.env.SOLIDITY_COVERAGE) { const coverageSubprovider = getCoverageSubproviderSingleton(); await coverageSubprovider.writeCoverageAsync(); } diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index 3e5708402..8193b78ac 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -2,7 +2,7 @@ ## v0.3.0 - _TBD, 2018_ - * Add coverage subprovider if enabled (#426) + * Add coverage subprovider if SOLIDITY_COVERAGE env variable is true (#426) * Refactor `BlockchainLifecycle` to work with in-process ganache (#426) * Remove `RPC` class and move it's logic to `Web3Wrapper` (#426) diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts index 4077dc13b..200670c3b 100644 --- a/packages/dev-utils/src/web3_factory.ts +++ b/packages/dev-utils/src/web3_factory.ts @@ -35,7 +35,7 @@ export const web3Factory = { }, getRpcProvider(config: Web3Config = {}): Web3.Provider { const provider = new ProviderEngine(); - if (process.env.COVERAGE) { + if (process.env.SOLIDITY_COVERAGE) { provider.addProvider(getCoverageSubproviderSingleton()); } const hasAddresses = _.isUndefined(config.hasAddresses) || config.hasAddresses; -- cgit v1.2.3