Use @solidity-parser/parser (#206)

cgewecke · Apr 10, 2020 · 0085709 · 0085709
1 parent 007b2e9
commit 0085709
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,5 +1,5 @@
 const fs = require("fs");
-const parser = require("solidity-parser-diligence");
+const parser = require("@solidity-parser/parser");
 const request = require("request-promise-native");
 const path = require("path");
 const read = require("fs-readdir-recursive");

diff --git a/mock/package.json b/mock/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.0.0-beta.146",
+    "@solidity-parser/parser": "^0.5.2",
     "cli-table3": "^0.5.0",
     "colors": "^1.1.2",
     "ethereumjs-util": "6.2.0",
@@ -47,7 +48,6 @@
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "sha1": "^1.1.1",
-    "solidity-parser-diligence": "^0.4.17",
     "sync-request": "^6.0.0"
   },
   "devDependencies": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@ethersproject/abi": "^5.0.0-beta.146",
+    "@solidity-parser/parser": "^0.5.2",
     "cli-table3": "^0.5.0",
     "colors": "^1.1.2",
     "ethereumjs-util": "6.2.0",
@@ -47,7 +48,6 @@
     "request": "^2.88.0",
     "request-promise-native": "^1.0.5",
     "sha1": "^1.1.1",
-    "solidity-parser-diligence": "^0.4.17",
     "sync-request": "^6.0.0"
   },
   "devDependencies": {

diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -31,11 +31,11 @@ elif [ "$TEST" = "colony" ]; then
   SLUG="$TRAVIS_REPO_SLUG"
   BRANCH="$TRAVIS_BRANCH"
 
-  if test -z "$TRAVIS_PULL_REQUEST_SLUG"; then
+  if [ -n "$TRAVIS_PULL_REQUEST_SLUG" ]; then
     SLUG="$TRAVIS_PULL_REQUEST_SLUG"
   fi
 
-  if test -z "$TRAVIS_PULL_REQUEST_BRANCH"; then
+  if [ -n "$TRAVIS_PULL_REQUEST_BRANCH" ]; then
     BRANCH="$TRAVIS_PULL_REQUEST_BRANCH"
   fi