merge v2-prototype

2018-06-06 12:31:30 +02:00
parent fe437da751 cc39eea999
commit 271fa26890
71 changed files with 1258 additions and 3864 deletions
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -15,7 +15,8 @@
        "prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
        "copy_artifacts": "copyfiles -u 4 '../migrations/artifacts/2.0.0/**/*' ./lib/src/artifacts;",
        "build": "tsc",
-        "test": "run-s build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild_and_test": "run-s build test",
        "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
        "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
        "compile": "sol-compiler",