From ba8ac16df48cfb9460d12c897d0a82e7003d119d Mon Sep 17 00:00:00 2001 From: Mathew Cormier Date: Fri, 3 Jan 2020 15:59:53 -0500 Subject: [PATCH 1/3] Run local truffle --- packages/cli/src/helpers/truffle-runner.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/cli/src/helpers/truffle-runner.js b/packages/cli/src/helpers/truffle-runner.js index 46bdc448a..3267184e6 100644 --- a/packages/cli/src/helpers/truffle-runner.js +++ b/packages/cli/src/helpers/truffle-runner.js @@ -1,12 +1,9 @@ import execa from 'execa' import devnull from 'dev-null' -import { getBinary, getPackageRoot } from '@aragon/toolkit' - -const truffleBin = getBinary('truffle', getPackageRoot(__dirname)) export const runTruffle = (args, { stdout, stderr, stdin }) => { return new Promise((resolve, reject) => { - const truffle = execa(truffleBin, args) + const truffle = execa('truffle', args, { preferLocal: true } ) let errMsg = '' truffle.on('exit', code => { code === 0 ? resolve() : reject(errMsg) From 3aa91225438609882f7e7948e2127b2f387d3ec4 Mon Sep 17 00:00:00 2001 From: Mathew Cormier Date: Fri, 3 Jan 2020 16:01:09 -0500 Subject: [PATCH 2/3] Remove truffle fix lint --- packages/cli/package.json | 1 - packages/cli/src/helpers/truffle-runner.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 1e31240f6..78ad5899b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -82,7 +82,6 @@ "semver": "^6.1.1", "source-map-support": "^0.5.11", "tmp-promise": "^2.0.1", - "truffle": "5.1.4", "truffle-flattener": "^1.2.9", "web3": "^1.2.4", "web3-utils": "^1.2.4", diff --git a/packages/cli/src/helpers/truffle-runner.js b/packages/cli/src/helpers/truffle-runner.js index 3267184e6..a239932c4 100644 --- a/packages/cli/src/helpers/truffle-runner.js +++ b/packages/cli/src/helpers/truffle-runner.js @@ -3,7 +3,7 @@ import devnull from 'dev-null' export const runTruffle = (args, { stdout, stderr, stdin }) => { return new Promise((resolve, reject) => { - const truffle = execa('truffle', args, { preferLocal: true } ) + const truffle = execa('truffle', args, { preferLocal: true }) let errMsg = '' truffle.on('exit', code => { code === 0 ? resolve() : reject(errMsg) From 781b270d3d0f76e986b6a60751f6df62e0286cb2 Mon Sep 17 00:00:00 2001 From: Gabriel Garcia Date: Fri, 3 Jan 2020 18:40:33 -0300 Subject: [PATCH 3/3] Add truffle as dev-dependency for tests --- packages/cli/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 78ad5899b..71a2f9bd7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -121,7 +121,8 @@ "nyc": "^14.1.1", "prettier": "^1.15.3", "proxyquire": "^2.1.0", - "sinon": "^7.3.1" + "sinon": "^7.3.1", + "truffle": "^5.1.6" }, "engines": { "node": ">=10.0.0"