Merge branch 'implementFirstExchangeMethod' of github.com:0xProject/0x.js into implementFirstExchangeMethod

This commit is contained in:
Fabio Berger 2017-05-26 17:41:23 +02:00
commit 1d4a52fe15
2 changed files with 9 additions and 1 deletions

View File

@ -4,4 +4,10 @@ machine:
test: test:
override: 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 test:coverage
- npm run lint

View File

@ -20,7 +20,8 @@
"docs:json": "typedoc --json docs/index.json .", "docs:json": "typedoc --json docs/index.json .",
"docs:generate": "typedoc --out docs .", "docs:generate": "typedoc --out docs .",
"docs:open": "opn docs/index.html", "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": { "config": {
"artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken" "artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken"
@ -47,6 +48,7 @@
"chai-as-promised": "^6.0.0", "chai-as-promised": "^6.0.0",
"chai-bignumber": "^2.0.0", "chai-bignumber": "^2.0.0",
"copyfiles": "^1.2.0", "copyfiles": "^1.2.0",
"ethereumjs-testrpc": "^3.0.5",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"mocha": "^3.4.1", "mocha": "^3.4.1",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",