diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-25 17:49:14 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-25 17:49:14 +0800 |
| commit | 9b196ba68c9f958cd82ef99ae87fdd87c70441a9 (patch) | |
| tree | 26f265a0293703627fffd1993336a57ee694d670 /packages/metacoin/package.json | |
| parent | 5bfdffda1155e306b17eee0a4e60320c3433d5c4 (diff) | |
| parent | f8bde5ab9b8e5d4ec8b9532dfbf18d1202dbfb29 (diff) | |
| download | dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.gz dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.bz2 dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.lz dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.xz dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.tar.zst dexon-sol-tools-9b196ba68c9f958cd82ef99ae87fdd87c70441a9.zip | |
Merge branch 'v2-prototype' into feature/combinatorial-testing
* v2-prototype: (97 commits)
Fix typos in comments
Add modifier and tests for removeAuthorizedAddressAtIndex
Update and add tests
Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex
Move isFunctionRemoveAuthorizedAddress to test
Fix usage of `popLastByte`
Fix LibBytes is a library
Remove `areBytesEqual`
Fix usage of `contentAddress()`
Clean low bits in bytes4
Clean high bits in address
Refactor LibBytes.readBytes4 for consistency
Fix LibBytes.equals
Add trailing garbage testcase for LibBytes.equals
Rename bytes.equals
Add slice and sliceDestructive
Rename bytes.rawAddress and add bytes.contentAddress
Rename read/writeBytesWithLength
Using LibBytes for bytes
Make LibBytes a library
...
# Conflicts:
# packages/contracts/src/utils/constants.ts
# packages/contracts/test/exchange/core.ts
Diffstat (limited to 'packages/metacoin/package.json')
| -rw-r--r-- | packages/metacoin/package.json | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 6db14334e..6b6ab9c40 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -17,7 +17,7 @@ "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "test:profile": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html", - "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit --timeout 10000", + "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit --timeout 10000", "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", @@ -36,11 +36,15 @@ "@0xproject/subproviders": "^0.10.4", "@0xproject/tslint-config": "^0.4.20", "@0xproject/types": "^0.8.1", + "@0xproject/typescript-typings": "^0.4.1", "@0xproject/utils": "^0.7.1", "@0xproject/web3-wrapper": "^0.7.1", - "ethereum-types": "^0.0.1", + "@types/mocha": "^5.2.2", + "copyfiles": "^2.0.0", + "ethereum-types": "^0.0.2", "ethers": "3.0.22", "lodash": "^4.17.4", + "run-s": "^0.0.0", "web3-provider-engine": "^14.0.4" }, "devDependencies": { |