diff --git a/.travis.yml b/.travis.yml index 9d9c0f64..8e72c672 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,5 +38,5 @@ jobs: - name: "Run coverage" script: - - ./node_modules/.bin/truffle run coverage + - ./node_modules/.bin/truffle run coverage -solcoverjs ./scripts/.solcover.js --network test - cat ./coverage/lcov.info | node_modules/.bin/coveralls diff --git a/scripts/.solcover.js b/scripts/.solcover.js new file mode 100644 index 00000000..80701930 --- /dev/null +++ b/scripts/.solcover.js @@ -0,0 +1,5 @@ +module.exports = { + providerOptions: { + "port" : 8545 + } +}; \ No newline at end of file diff --git a/test/helpers.js b/test/helpers.js index fe092fbc..3f50eee8 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -41,8 +41,9 @@ const createERC721DepositProposalData = ( }; const advanceBlock = () => { - let provider = new Ethers.providers.Web3Provider(web3.currentProvider); - return provider.send("evm_mine", [new Date().getTime()]) + let provider = new Ethers.providers.JsonRpcProvider(); + const time = Math.floor(Date.now() / 1000); + return provider.send("evm_mine", [time]); } const createGenericDepositData = (resourceID, hexMetaData) => { diff --git a/truffle-config.js b/truffle-config.js index e91a5c02..7130bb87 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -53,6 +53,12 @@ module.exports = { port: 8545, // Standard Ethereum port (default: none) network_id: "5", // Any network (default: none) }, + + test: { + host: "127.0.0.1", // Localhost (default: none) + port: 8545, // Standard Ethereum port (default: none) + network_id: "*", // Any network (default: none) + }, // Another network with more advanced options... // advanced: { // port: 8777, // Custom port