Merge remote-tracking branch 'origin/master' into refactor_logic6

kenITpro · Feb 5, 2020 · 95c6bf0 · 95c6bf0
2 parents 4b7ee33 + 50b2c87
commit 95c6bf0
Show file tree

Hide file tree

Showing 60 changed files with 9,143 additions and 10,345 deletions.
diff --git a/README.md b/README.md
@@ -109,7 +109,9 @@ To run the Selenium tests via Nightwatch:
 		- npm run nightwatch_local_console
 		
 		- npm run nightwatch_local_remixd # remixd needs to be run
-		
+
+ **the `ballot` tests suite requires to run `ganache-cli` locally.** 
+ **the `remixd` tests suite requires to run `remixd` locally.** 
 
 
 ## Usage as a Chrome Extension

diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh
@@ -15,6 +15,7 @@ BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
 echo "$BUILD_ID"
 TEST_EXITCODE=0
 
+npm run ganache-cli &
 npm run serve &
 setupRemixd
 

diff --git a/ci/makeMockCompiler.js b/ci/makeMockCompiler.js
@@ -3,7 +3,7 @@
 var fs = require('fs')
 var compiler = require('solc')
 var compilerInput = require('remix-solidity').CompilerInput
-var defaultVersion = 'v0.5.14+commit.1f1aaa4'
+var defaultVersion = 'v0.6.1+commit.e6f7d5a4'
 
 compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => {
   if (error) console.log(error)

diff --git a/contracts/node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol b/contracts/node_modules/openzeppelin-solidity/contracts/math/SafeMath.sol
diff --git a/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol b/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol