diff --git a/.circleci/config.yml b/.circleci/config.yml index b37a6eb..4748728 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -83,8 +83,7 @@ workflows: build: jobs: - unit-test - # Temporarily disabled due to unskipped GSN gas measurement tests - # - e2e-zeppelin + - e2e-zeppelin - e2e-metacoin - e2e-metacoin-windows - e2e-nomiclabs diff --git a/package.json b/package.json index 5898dfa..b055340 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "author": "", "license": "ISC", "dependencies": { - "@solidity-parser/parser": "^0.8.1", + "@solidity-parser/parser": "^0.10.1", "@truffle/provider": "^0.2.24", "chalk": "^2.4.2", "death": "^1.1.0", diff --git a/scripts/run-nomiclabs.sh b/scripts/run-nomiclabs.sh index 1b5eff0..72a42ef 100755 --- a/scripts/run-nomiclabs.sh +++ b/scripts/run-nomiclabs.sh @@ -97,33 +97,12 @@ echo "" cd .. git clone https://github.com/sc-forks/example-buidler-ethers.git cd example-buidler-ethers -npm install --silent +yarn # Install and run solidity-coverage @ PR -npm install --save-dev --silent $PR_PATH +yarn add $PR_PATH --dev cat package.json npx buidler coverage verifyCoverageExists - -echo "" -echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" -echo "Complex: MolochDao/moloch " -echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" -echo "" - -# Install sc-forks/moloch -cd .. -git clone https://github.com/sc-forks/moloch.git -cd moloch -npm install --silent -npm uninstall --save-dev --silent solidity-coverage - -# Install and run solidity-coverage @ PR -# Should run on network 'localhost' -npm install --save-dev --silent $PR_PATH -npm run coverage - -verifyCoverageExists - diff --git a/yarn.lock b/yarn.lock index 70ea2dd..3401653 100644 --- a/yarn.lock +++ b/yarn.lock @@ -473,6 +473,10 @@ version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" +"@solidity-parser/parser@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.10.1.tgz#d3680d1ebebed21eee67f58a41eb92175204f0c7" + "@solidity-parser/parser@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.5.2.tgz#4d74670ead39e4f4fdab605a393ba8ea2390a2c4" @@ -485,10 +489,6 @@ version "0.8.2" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.8.2.tgz#a6a5e93ac8dca6884a99a532f133beba59b87b69" -"@solidity-parser/parser@^0.8.1": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.8.1.tgz#1b606578af86b9ad10755409804a6ba83f9ce8a4" - "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"