From a2f283379d17bbf00995cf8db935a594b91e01dc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 May 2017 17:25:00 +0200 Subject: Add testrpc as a dependency and a command for running it --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 48a26fd48..5f7b7014a 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "docs:json": "typedoc --json docs/index.json .", "docs:generate": "typedoc --out docs .", "docs:open": "opn docs/index.html", - "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ./../contracts/build/contracts/$i.json ./../0x.js/src/artifacts; done;" + "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ./../contracts/build/contracts/$i.json ./../0x.js/src/artifacts; done;", + "testrpc": "testrpc -p 8545 --networkId 50" }, "config": { "artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken" @@ -47,6 +48,7 @@ "chai-as-promised": "^6.0.0", "chai-bignumber": "^2.0.0", "copyfiles": "^1.2.0", + "ethereumjs-testrpc": "^3.0.5", "json-loader": "^0.5.4", "mocha": "^3.4.1", "npm-run-all": "^4.0.2", -- cgit From 65caf6444137aecaf71015400ffcbec128c2db0f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 May 2017 17:28:28 +0200 Subject: Add contracts deployment and copying the artefacts to circle.ym --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index 65db7c29a..3c0c25d97 100644 --- a/circle.yml +++ b/circle.yml @@ -4,4 +4,9 @@ machine: test: override: + - node node_modules/ethereumjs-testrpc/bin/testrpc: + background: true + - git clone git@github.com:0xProject/contracts.git .. + - cd ..; npm run migrate + - npm run update_contracts - npm run test:coverage -- cgit From dc3449289851676b7be71c25e23ef98344f47668 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 May 2017 17:30:51 +0200 Subject: Fix paths in circle.yml --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 3c0c25d97..cc2feaea0 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ test: override: - node node_modules/ethereumjs-testrpc/bin/testrpc: background: true - - git clone git@github.com:0xProject/contracts.git .. - - cd ..; npm run migrate + - git clone git@github.com:0xProject/contracts.git ../contracts + - cd ../contracts; npm run migrate - npm run update_contracts - npm run test:coverage -- cgit From 635ebdc670240271f9add4b40c60b983356ca938 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 May 2017 17:33:00 +0200 Subject: Install contract dependencies --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index cc2feaea0..ddd719dd5 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,6 @@ test: - node node_modules/ethereumjs-testrpc/bin/testrpc: background: true - git clone git@github.com:0xProject/contracts.git ../contracts - - cd ../contracts; npm run migrate + - cd ../contracts; npm install && npm run migrate - npm run update_contracts - npm run test:coverage -- cgit From a7d57c38bb9db3dc7530a738bbe050b56f60ea92 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 May 2017 17:39:31 +0200 Subject: Add linting to test pipeline --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index ddd719dd5..338bf0b87 100644 --- a/circle.yml +++ b/circle.yml @@ -10,3 +10,4 @@ test: - cd ../contracts; npm install && npm run migrate - npm run update_contracts - npm run test:coverage + - npm run lint -- cgit