diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-14 19:17:12 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-01-14 19:17:12 +0800 |
| commit | bf183af9a42aefd1c639e5924ed93f93fd821378 (patch) | |
| tree | fd2f875248d8ccd4f287c61e749787343cec5723 /contracts/test-utils | |
| parent | 2b8f0d887ad529bb0557a55c67cc162977c7b270 (diff) | |
| parent | 797d7c7878e33ce012259a6a5db5335e9dc838ba (diff) | |
| download | dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.gz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.bz2 dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.lz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.xz dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.tar.zst dexon-sol-tools-bf183af9a42aefd1c639e5924ed93f93fd821378.zip | |
Merge development
Diffstat (limited to 'contracts/test-utils')
| -rw-r--r-- | contracts/test-utils/CHANGELOG.json | 18 | ||||
| -rw-r--r-- | contracts/test-utils/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | contracts/test-utils/package.json | 30 | ||||
| -rw-r--r-- | contracts/test-utils/src/types.ts | 14 |
4 files changed, 44 insertions, 22 deletions
diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 8ba8d179a..7bebd0fcb 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,5 +1,23 @@ [ { + "version": "2.0.0", + "changes": [ + { + "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule", + "pr": 1474 + } + ] + }, + { + "timestamp": 1547225310, + "version": "1.0.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "timestamp": 1547040760, "version": "1.0.3", "changes": [ diff --git a/contracts/test-utils/CHANGELOG.md b/contracts/test-utils/CHANGELOG.md index 4732f1746..6aa89cd76 100644 --- a/contracts/test-utils/CHANGELOG.md +++ b/contracts/test-utils/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.4 - _January 11, 2019_ + + * Dependencies updated + ## v1.0.3 - _January 9, 2019_ * Dependencies updated diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 2653fc0e4..bf3b23921 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0x/contracts-test-utils", - "version": "1.0.3", + "version": "1.0.4", "engines": { "node": ">=6.12" }, @@ -40,19 +40,19 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/sol-coverage": "^1.0.0", - "@0x/sol-profiler": "^1.0.0", - "@0x/sol-trace": "^1.0.0", - "@0x/abi-gen": "^1.0.20", - "@0x/dev-utils": "^1.0.22", - "@0x/order-utils": "^3.1.0", - "@0x/sol-compiler": "^2.0.0", - "@0x/subproviders": "^2.1.9", - "@0x/tslint-config": "^2.0.0", - "@0x/types": "^1.5.0", - "@0x/typescript-typings": "^3.0.6", - "@0x/utils": "^2.1.1", - "@0x/web3-wrapper": "^3.2.2", + "@0x/abi-gen": "^1.0.21", + "@0x/dev-utils": "^1.0.23", + "@0x/order-utils": "^3.1.1", + "@0x/sol-compiler": "^2.0.1", + "@0x/sol-coverage": "^1.0.1", + "@0x/sol-profiler": "^1.0.1", + "@0x/sol-trace": "^1.0.1", + "@0x/subproviders": "^2.1.10", + "@0x/tslint-config": "^2.0.1", + "@0x/types": "^1.5.1", + "@0x/typescript-typings": "^3.0.7", + "@0x/utils": "^3.0.0", + "@0x/web3-wrapper": "^3.2.3", "@types/bn.js": "^4.11.0", "@types/ethereumjs-abi": "^0.6.0", "@types/js-combinatorics": "^0.5.29", @@ -63,7 +63,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^2.0.1", "dirty-chai": "^2.0.1", - "ethereum-types": "^1.1.4", + "ethereum-types": "^1.1.5", "ethereumjs-abi": "0.6.5", "ethereumjs-util": "^5.1.1", "ethers": "~4.0.4", diff --git a/contracts/test-utils/src/types.ts b/contracts/test-utils/src/types.ts index 1630eab0d..60cb2b102 100644 --- a/contracts/test-utils/src/types.ts +++ b/contracts/test-utils/src/types.ts @@ -70,13 +70,13 @@ export interface Token { } export enum OrderStatus { - INVALID, - INVALID_MAKER_ASSET_AMOUNT, - INVALID_TAKER_ASSET_AMOUNT, - FILLABLE, - EXPIRED, - FULLY_FILLED, - CANCELLED, + Invalid, + InvalidMakerAssetAmount, + InvalidTakerAssetAmount, + Fillable, + Expired, + FullyFilled, + Cancelled, } export enum ContractName { |