diff options
| -rw-r--r-- | packages/0x.js/package.json | 3 | ||||
| -rw-r--r-- | packages/0x.js/src/utils/assert.ts | 2 | ||||
| -rw-r--r-- | packages/assert/README.md (renamed from packages/0x-assert/README.md) | 0 | ||||
| -rw-r--r-- | packages/assert/circle.yml (renamed from packages/0x-assert/circle.yml) | 0 | ||||
| -rw-r--r-- | packages/assert/package.json (renamed from packages/0x-assert/package.json) | 5 | ||||
| -rw-r--r-- | packages/assert/src/globals.d.ts (renamed from packages/0x-assert/src/globals.d.ts) | 0 | ||||
| -rw-r--r-- | packages/assert/src/index.ts (renamed from packages/0x-assert/src/index.ts) | 0 | ||||
| -rw-r--r-- | packages/assert/test/assert_test.ts (renamed from packages/0x-assert/test/assert_test.ts) | 0 | ||||
| -rw-r--r-- | packages/assert/tsconfig.json (renamed from packages/0x-assert/tsconfig.json) | 0 | ||||
| -rw-r--r-- | packages/assert/tslint.json (renamed from packages/0x-assert/tslint.json) | 0 |
10 files changed, 5 insertions, 5 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 02ae87cd5..2866f1a9e 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -98,6 +98,7 @@ "lodash": "^4.17.4", "publish-release": "^1.3.3", "uuid": "^3.1.0", - "web3": "^0.20.0" + "web3": "^0.20.0", + "@0xproject/assert": "0.0.3" } } diff --git a/packages/0x.js/src/utils/assert.ts b/packages/0x.js/src/utils/assert.ts index b6f6c5c95..775a7a609 100644 --- a/packages/0x.js/src/utils/assert.ts +++ b/packages/0x.js/src/utils/assert.ts @@ -5,7 +5,7 @@ import {SchemaValidator, Schema} from '0x-json-schemas'; import {Web3Wrapper} from '../web3_wrapper'; import {signatureUtils} from '../utils/signature_utils'; import {ECSignature} from '../types'; -import {assert as sharedAssert} from '0x-assert'; +import {assert as sharedAssert} from '@0xproject/assert'; const HEX_REGEX = /^0x[0-9A-F]*$/i; diff --git a/packages/0x-assert/README.md b/packages/assert/README.md index 4e72d5bcb..4e72d5bcb 100644 --- a/packages/0x-assert/README.md +++ b/packages/assert/README.md diff --git a/packages/0x-assert/circle.yml b/packages/assert/circle.yml index 32b9e7315..32b9e7315 100644 --- a/packages/0x-assert/circle.yml +++ b/packages/assert/circle.yml diff --git a/packages/0x-assert/package.json b/packages/assert/package.json index c560ca5dc..ab640b361 100644 --- a/packages/0x-assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "0x-assert", + "name": "@0xproject/assert", "version": "0.0.3", "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", @@ -41,7 +41,6 @@ "bignumber.js": "~4.1.0", "ethereum-address": "^0.0.4", "lodash": "^4.17.4", - "valid-url": "^1.0.9", - "0x-assert": "0.0.3" + "valid-url": "^1.0.9" } } diff --git a/packages/0x-assert/src/globals.d.ts b/packages/assert/src/globals.d.ts index cc47f3113..cc47f3113 100644 --- a/packages/0x-assert/src/globals.d.ts +++ b/packages/assert/src/globals.d.ts diff --git a/packages/0x-assert/src/index.ts b/packages/assert/src/index.ts index bfbb56b23..bfbb56b23 100644 --- a/packages/0x-assert/src/index.ts +++ b/packages/assert/src/index.ts diff --git a/packages/0x-assert/test/assert_test.ts b/packages/assert/test/assert_test.ts index 0e35f7f50..0e35f7f50 100644 --- a/packages/0x-assert/test/assert_test.ts +++ b/packages/assert/test/assert_test.ts diff --git a/packages/0x-assert/tsconfig.json b/packages/assert/tsconfig.json index 709e20154..709e20154 100644 --- a/packages/0x-assert/tsconfig.json +++ b/packages/assert/tsconfig.json diff --git a/packages/0x-assert/tslint.json b/packages/assert/tslint.json index 5842a872a..5842a872a 100644 --- a/packages/0x-assert/tslint.json +++ b/packages/assert/tslint.json |