diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-05-26 23:41:23 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-05-26 23:41:23 +0800 |
| commit | 1d4a52fe15988fb8534c441c539f55dd5d18db1a (patch) | |
| tree | 0a1a0112fe4bd1fe66c69ca44dfd851a7aaf5318 | |
| parent | 79249f5e8a37e139c9297a94479f269bf61514af (diff) | |
| parent | a7d57c38bb9db3dc7530a738bbe050b56f60ea92 (diff) | |
| download | dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar.gz dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar.bz2 dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar.lz dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar.xz dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.tar.zst dexon-sol-tools-1d4a52fe15988fb8534c441c539f55dd5d18db1a.zip | |
Merge branch 'implementFirstExchangeMethod' of github.com:0xProject/0x.js into implementFirstExchangeMethod
| -rw-r--r-- | circle.yml | 6 | ||||
| -rw-r--r-- | package.json | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml index 65db7c29a..338bf0b87 100644 --- a/circle.yml +++ b/circle.yml @@ -4,4 +4,10 @@ machine: test: override: + - node node_modules/ethereumjs-testrpc/bin/testrpc: + background: true + - git clone git@github.com:0xProject/contracts.git ../contracts + - cd ../contracts; npm install && npm run migrate + - npm run update_contracts - npm run test:coverage + - npm run lint 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", |