Skip to content

Commit

Permalink
Merge 7f26720 into 79c24bb
Browse files Browse the repository at this point in the history
  • Loading branch information
VictorVicente committed Sep 3, 2018
2 parents 79c24bb + 7f26720 commit abaa87e
Show file tree
Hide file tree
Showing 7 changed files with 505 additions and 70 deletions.
23 changes: 3 additions & 20 deletions .solcover.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,7 @@ module.exports = {
norpc: true,
port: 8545,
copyPackages: ['openzeppelin-solidity'],
skipFiles: ['tokens/STFactory.sol',
'interfaces/IModule.sol',
'interfaces/IModuleFactory.sol',
'interfaces/IModuleRegistry.sol',
'interfaces/ISecurityToken.sol',
'interfaces/ISecurityTokenRegistry.sol',
'interfaces/IST20.sol',
'interfaces/ISTFactory.sol',
'interfaces/ITickerRegistry.sol',
'helpers/Util.sol',
'helpers/TokenBurner.sol',
'helpers/PolyToken.sol',
'Migrations.sol',
'mocks/PolyTokenFaucet.sol',
'mocks/TestSTOFactory.sol',
'mocks/MockFactory.sol',
'oracles/MakerDAOOracle.sol',
'oracles/PolyOracle.sol',
'external/Medianizer.sol',
'external/oraclizeAPI.sol']
testCommand: 'node ../node_modules/.bin/truffle test `find test/*.js ! -name a_poly_oracle.js` --network coverage',
deepSkip: true,
skipFiles: ['external', 'flat']
};
17 changes: 4 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
language: node_js
node_js:
- '8'
- '8'
cache:
directories:
- node_modules
env:
- SOLIDITY_COVERAGE=false
matrix:
fast_finish: true
allow_failures:
- env: SOLIDITY_COVERAGE=true
before_install:
- echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum
- sudo apt-get -y update
- sudo apt-get -y install solc
before_script:
- truffle version
- truffle version
script:
- npm run test
- npm run docs
- npm run test
notifications:
slack:
secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc=
secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc=
Loading

0 comments on commit abaa87e

Please sign in to comment.