diff --git a/.travis.yml b/.travis.yml index 269633629f..fa6396a71d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ install: - travis_wait 60 npm install jobs: allow_failures: - - script: npm run coverage:agent - script: npm run coverage:payroll include: - stage: tests diff --git a/apps/agent/package.json b/apps/agent/package.json index 015e7181f3..46a6cda3f1 100644 --- a/apps/agent/package.json +++ b/apps/agent/package.json @@ -37,10 +37,10 @@ "@aragon/test-helpers": "^2.0.0", "eth-ens-namehash": "^2.0.8", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ethereumjs-util": "^6.1.0", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1", diff --git a/apps/finance/package.json b/apps/finance/package.json index 4ea4b7a81c..5bf4da72eb 100644 --- a/apps/finance/package.json +++ b/apps/finance/package.json @@ -43,9 +43,9 @@ "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1" diff --git a/apps/survey/.solcover.js b/apps/survey/.solcover.js index e5e3dbea03..0b04424416 100644 --- a/apps/survey/.solcover.js +++ b/apps/survey/.solcover.js @@ -6,5 +6,7 @@ module.exports = { '@aragon/os', '@aragon/apps-shared-minime', '@aragon/test-helpers', - ] + ], + // Turn on deep skip to avoid preprocessing (e.g. removing view/pure modifiers) for skipped files + deepSkip: true } diff --git a/apps/survey/contracts/test/TestImports.sol b/apps/survey/contracts/test/TestImports.sol index 40b85431ed..f28e113625 100644 --- a/apps/survey/contracts/test/TestImports.sol +++ b/apps/survey/contracts/test/TestImports.sol @@ -5,6 +5,7 @@ import "@aragon/os/contracts/kernel/Kernel.sol"; import "@aragon/os/contracts/factory/DAOFactory.sol"; import "@aragon/os/contracts/factory/EVMScriptRegistryFactory.sol"; +import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol"; import "@aragon/apps-shared-migrations/contracts/Migrations.sol"; // You might think this file is a bit odd, but let me explain. diff --git a/apps/survey/package.json b/apps/survey/package.json index 74dc06d2e4..8a87b7b4e0 100644 --- a/apps/survey/package.json +++ b/apps/survey/package.json @@ -37,9 +37,9 @@ "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1" diff --git a/apps/token-manager/package.json b/apps/token-manager/package.json index e57e2066e8..c94dd15a5f 100644 --- a/apps/token-manager/package.json +++ b/apps/token-manager/package.json @@ -43,9 +43,9 @@ "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1" diff --git a/apps/token-manager/test/tokenmanager.js b/apps/token-manager/test/tokenmanager.js index e916557f48..b2107cc088 100644 --- a/apps/token-manager/test/tokenmanager.js +++ b/apps/token-manager/test/tokenmanager.js @@ -8,14 +8,12 @@ const ExecutionTarget = artifacts.require('ExecutionTarget') const TokenManager = artifacts.require('TokenManagerMock') const MiniMeToken = artifacts.require('MiniMeToken') -const ACL = artifacts.require('@aragon/core/contracts/acl/ACL') -const Kernel = artifacts.require('@aragon/core/contracts/kernel/Kernel') -const DAOFactory = artifacts.require('@aragon/core/contracts/factory/DAOFactory') -const EVMScriptRegistryFactory = artifacts.require('@aragon/core/contracts/factory/EVMScriptRegistryFactory') +const ACL = artifacts.require('ACL') +const Kernel = artifacts.require('Kernel') +const DAOFactory = artifacts.require('DAOFactory') +const EVMScriptRegistryFactory = artifacts.require('EVMScriptRegistryFactory') const EtherTokenConstantMock = artifacts.require('EtherTokenConstantMock') -const getContract = name => artifacts.require(name) - const n = '0x00' const ANY_ADDR = '0xffffffffffffffffffffffffffffffffffffffff' @@ -52,8 +50,8 @@ contract('Token Manager', ([root, holder, holder2, anyone]) => { const NOW = 1 before(async () => { - const kernelBase = await getContract('Kernel').new(true) // petrify immediately - const aclBase = await getContract('ACL').new() + const kernelBase = await Kernel.new(true) // petrify immediately + const aclBase = await ACL.new() const regFact = await EVMScriptRegistryFactory.new() daoFact = await DAOFactory.new(kernelBase.address, aclBase.address, regFact.address) tokenManagerBase = await TokenManager.new() diff --git a/apps/vault/package.json b/apps/vault/package.json index 3c7241ec40..63152003c1 100644 --- a/apps/vault/package.json +++ b/apps/vault/package.json @@ -40,9 +40,9 @@ "@aragon/test-helpers": "^2.0.0", "eth-ens-namehash": "^2.0.8", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1" diff --git a/apps/voting/contracts/test/TestImports.sol b/apps/voting/contracts/test/TestImports.sol index 49d01977b0..7e2c3a52e0 100644 --- a/apps/voting/contracts/test/TestImports.sol +++ b/apps/voting/contracts/test/TestImports.sol @@ -5,6 +5,7 @@ import "@aragon/os/contracts/kernel/Kernel.sol"; import "@aragon/os/contracts/factory/DAOFactory.sol"; import "@aragon/os/contracts/factory/EVMScriptRegistryFactory.sol"; +import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol"; import "@aragon/apps-shared-migrations/contracts/Migrations.sol"; // You might think this file is a bit odd, but let me explain. diff --git a/apps/voting/package.json b/apps/voting/package.json index e7ae9eea4e..adea6298ed 100644 --- a/apps/voting/package.json +++ b/apps/voting/package.json @@ -44,9 +44,9 @@ "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solidity-sha3": "^0.4.1", "solium": "^1.2.3", "truffle": "4.1.14", diff --git a/apps/voting/test/voting.js b/apps/voting/test/voting.js index 0ebdae8831..ad66d83cd1 100644 --- a/apps/voting/test/voting.js +++ b/apps/voting/test/voting.js @@ -8,13 +8,12 @@ const ExecutionTarget = artifacts.require('ExecutionTarget') const Voting = artifacts.require('VotingMock') -const ACL = artifacts.require('@aragon/os/contracts/acl/ACL') -const Kernel = artifacts.require('@aragon/os/contracts/kernel/Kernel') -const DAOFactory = artifacts.require('@aragon/os/contracts/factory/DAOFactory') -const EVMScriptRegistryFactory = artifacts.require('@aragon/os/contracts/factory/EVMScriptRegistryFactory') -const MiniMeToken = artifacts.require('@aragon/apps-shared-minime/contracts/MiniMeToken') +const ACL = artifacts.require('ACL') +const Kernel = artifacts.require('Kernel') +const DAOFactory = artifacts.require('DAOFactory') +const EVMScriptRegistryFactory = artifacts.require('EVMScriptRegistryFactory') +const MiniMeToken = artifacts.require('MiniMeToken') -const getContract = name => artifacts.require(name) const bigExp = (x, y) => new web3.BigNumber(x).times(new web3.BigNumber(10).toPower(y)) const pct16 = x => bigExp(x, 16) const createdVoteId = receipt => getEventArgument(receipt, 'StartVote', 'voteId') @@ -59,8 +58,8 @@ contract('Voting App', ([root, holder1, holder2, holder20, holder29, holder51, n const votingDuration = 1000 before(async () => { - const kernelBase = await getContract('Kernel').new(true) // petrify immediately - const aclBase = await getContract('ACL').new() + const kernelBase = await Kernel.new(true) // petrify immediately + const aclBase = await ACL.new() const regFact = await EVMScriptRegistryFactory.new() daoFact = await DAOFactory.new(kernelBase.address, aclBase.address, regFact.address) votingBase = await Voting.new() diff --git a/future-apps/payroll/.solcover.js b/future-apps/payroll/.solcover.js index a5b87ed796..79a320134e 100644 --- a/future-apps/payroll/.solcover.js +++ b/future-apps/payroll/.solcover.js @@ -1,13 +1,21 @@ module.exports = { norpc: true, - copyPackages: ['@aragon/os', '@aragon/apps-finance', '@aragon/apps-vault', '@aragon/test-helpers'], + copyPackages: [ + '@aragon/os', + '@aragon/apps-finance', + '@aragon/apps-vault', + '@aragon/ppf-contracts', + '@aragon/test-helpers' + ], skipFiles: [ - 'test', + 'test', 'examples', '@aragon/os', '@aragon/apps-vault', '@aragon/apps-finance', '@aragon/ppf-contracts', '@aragon/test-helpers', - ] + ], + // Turn on deep skip to avoid preprocessing (e.g. removing view/pure modifiers) for skipped files + deepSkip: true } diff --git a/future-apps/payroll/package.json b/future-apps/payroll/package.json index c479cd3315..2964d40ad5 100644 --- a/future-apps/payroll/package.json +++ b/future-apps/payroll/package.json @@ -60,9 +60,9 @@ "@aragon/cli": "^6.0.0", "@aragon/test-helpers": "^2.0.0", "eth-gas-reporter": "^0.2.0", - "ethereumjs-testrpc-sc": "^6.1.6", + "ethereumjs-testrpc-sc": "^6.4.5-sc.3", "ganache-cli": "^6.4.3", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "^0.6.2", "solium": "^1.2.3", "truffle": "4.1.14", "truffle-extract": "^1.2.1" diff --git a/package.json b/package.json index 297db2a120..957028539d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "scripts": { "install": "node scripts/install", - "bootstrap": "lerna bootstrap --hoist --nohoist=@aragon/os --nohoist=@aragon/apps-shared-minime", + "bootstrap": "lerna bootstrap --hoist --nohoist=@aragon/os --nohoist=@aragon/apps-* --nohoist=@aragon/ppf-contracts", "bootstrap:ci": "npm run bootstrap -- --no-ci", "clean": "git clean -fdxi apps future-apps shared", "test": "npm run test:all", diff --git a/shared/test-helpers/package.json b/shared/test-helpers/package.json index 1431326cc0..ed4b641207 100644 --- a/shared/test-helpers/package.json +++ b/shared/test-helpers/package.json @@ -10,7 +10,7 @@ ], "peerDependencies": { "ganache-cli": "^6.0.0", - "solidity-coverage": "^0.5.11" + "solidity-coverage": "^0.6.2" }, "devDependencies": { "ethereumjs-abi": "^0.6.4"