Skip to content

Commit 7109a84

Browse files
committed
Make solcover configs as consistent as possible
1 parent 1f74585 commit 7109a84

File tree

3 files changed

+10
-85
lines changed

3 files changed

+10
-85
lines changed

.solcover.extensions.js

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
1-
const { execSync } = require("child_process");
2-
const log = console.log;
1+
const config = require("./.solcover.js")
32

4-
// Copies pre-built token artifacts to .coverage_artifacts/contracts
5-
function provisionTokenContracts(config){
6-
let output;
7-
const provisionColonyToken = `bash ./scripts/provision-token-contracts.sh`;
8-
9-
log('Provisioning ColonyToken contracts...')
10-
output = execSync(provisionColonyToken);
11-
log(output.toString())
12-
}
13-
14-
module.exports = {
15-
skipFiles: [
16-
'Migrations.sol',
17-
'common/EtherRouter.sol',
18-
'patriciaTree',
19-
'testHelpers',
20-
'ens'
21-
],
22-
providerOptions: {
23-
port: 8555,
24-
network_id: 1999,
25-
account_keys_path: "./ganache-accounts.json",
26-
vmErrorsOnRPCResponse: false,
27-
total_accounts: 18
28-
},
29-
onCompileComplete: provisionTokenContracts,
30-
istanbulFolder: "./coverage-extensions",
31-
modifierWhitelist: ["always"],
32-
}
3+
config.istanbulFolder = "./coverage-extensions"
334

5+
module.exports = config

.solcover.reputation.js

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
1-
const { execSync } = require("child_process");
2-
const log = console.log;
1+
const config = require("./.solcover.js")
32

4-
// Copies pre-built token artifacts to .coverage_artifacts/contracts
5-
function provisionTokenContracts(config){
6-
let output;
7-
const provisionColonyToken = `bash ./scripts/provision-token-contracts.sh`;
8-
9-
log('Provisioning ColonyToken contracts...')
10-
output = execSync(provisionColonyToken);
11-
log(output.toString())
12-
}
13-
14-
module.exports = {
15-
skipFiles: [
16-
'Migrations.sol',
17-
'common/EtherRouter.sol',
18-
'patriciaTree',
19-
'testHelpers',
20-
'ens',
21-
],
22-
providerOptions: {
23-
port: 8555,
24-
network_id: 1999,
25-
account_keys_path: "./ganache-accounts.json",
26-
vmErrorsOnRPCResponse: false,
27-
total_accounts: 18
28-
},
29-
onCompileComplete: provisionTokenContracts,
30-
istanbulFolder: "./coverage-reputation",
31-
modifierWhitelist: ["always"],
32-
}
3+
config.istanbulFolder = "./coverage-reputation"
334

5+
module.exports = config

.solcover.upgrade.js

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
const { execSync } = require("child_process");
2-
const log = console.log;
3-
4-
// Copies pre-built token artifacts to .coverage_artifacts/contracts
5-
function provisionTokenContracts(config){
6-
let output;
7-
const provisionColonyToken = `bash ./scripts/provision-token-contracts.sh`;
8-
9-
log('Provisioning ColonyToken contracts...')
10-
output = execSync(provisionColonyToken);
11-
log(output.toString())
12-
}
2+
const config = require("./.solcover.js")
133

144
function getFilesToSkip(){
155
const array = [
@@ -24,16 +14,7 @@ function getFilesToSkip(){
2414
return array.concat(output.toString().split('\n').slice(0,-1))
2515
}
2616

27-
module.exports = {
28-
skipFiles: getFilesToSkip(),
29-
providerOptions: {
30-
port: 8555,
31-
network_id: 1999,
32-
account_keys_path: "./ganache-accounts.json",
33-
vmErrorsOnRPCResponse: false,
34-
total_accounts: 18
35-
},
36-
onCompileComplete: provisionTokenContracts,
37-
istanbulFolder: "./coverage-upgrade"
38-
}
17+
config.istanbulFolder = "./coverage-upgrade"
18+
config.skipFiles = getFilesToSkip();
3919

20+
module.exports = config

0 commit comments

Comments
 (0)