Merge branch 'development' into improvement/use-wsrun

* development:
  Update ethereeumjs-testrpc to ganache-cli

# Conflicts:
#	package.json
This commit is contained in:
Fabio Berger 2018-05-14 22:31:53 +02:00
commit a703160226
2 changed files with 986 additions and 54 deletions

View File

@ -5,7 +5,7 @@
"packages/*"
],
"scripts": {
"testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
"ganache": "ganache-cli -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
"prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
"prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
"report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls",
@ -30,7 +30,7 @@
"devDependencies": {
"async-child-process": "^1.1.1",
"coveralls": "^3.0.0",
"ethereumjs-testrpc": "^6.0.3",
"ganache-cli": "^6.1.0",
"lcov-result-merger": "^2.0.0",
"lerna": "^2.5.1",
"npm-run-all": "^4.1.2",

1036
yarn.lock

File diff suppressed because it is too large Load Diff