diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-12-19 19:10:59 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 19:10:59 +0800 |
commit | 04268d7f4b4a8a3496518a450bfcf01bb056a57e (patch) | |
tree | 089c743f946ff175838b4ee3142d5ead1aecdc0c /packages/json-schemas | |
parent | c63f76dde7267c54328d2f12f401d94484e5a91a (diff) | |
parent | 156dae1d33bd0a19c764262fbf0c9d6743425fc6 (diff) | |
download | dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.gz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.bz2 dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.lz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.xz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.zst dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.zip |
Merge pull request #272 from 0xProject/fix/subscription-opts
Rename SubscriptionOpts to BlockRange
Diffstat (limited to 'packages/json-schemas')
-rw-r--r-- | packages/json-schemas/CHANGELOG.md | 4 | ||||
-rw-r--r-- | packages/json-schemas/schemas/block_range_schema.ts (renamed from packages/json-schemas/schemas/subscription_opts_schema.ts) | 4 | ||||
-rw-r--r-- | packages/json-schemas/src/schemas.ts | 10 | ||||
-rw-r--r-- | packages/json-schemas/test/schema_test.ts | 8 |
4 files changed, 15 insertions, 11 deletions
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index 9f080adeb..81225e5de 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +v0.x.x - _TBD, 2017_ +------------------------ + * Rename `subscriptionOptsSchema` to `blockRangeSchema` (#272) + v0.6.7 - _Nov. 14, 2017_ ------------------------ * Re-publish JSON-schema previously published under NPM package 0x-json-schemas diff --git a/packages/json-schemas/schemas/subscription_opts_schema.ts b/packages/json-schemas/schemas/block_range_schema.ts index a476e6963..b264cb66e 100644 --- a/packages/json-schemas/schemas/subscription_opts_schema.ts +++ b/packages/json-schemas/schemas/block_range_schema.ts @@ -10,8 +10,8 @@ export const blockParamSchema = { ], }; -export const subscriptionOptsSchema = { - id: '/SubscriptionOpts', +export const blockRangeSchema = { + id: '/BlockRange', properties: { fromBlock: {$ref: '/BlockParam'}, toBlock: {$ref: '/BlockParam'}, diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts index 69164cbc7..854291a71 100644 --- a/packages/json-schemas/src/schemas.ts +++ b/packages/json-schemas/src/schemas.ts @@ -3,6 +3,10 @@ import { numberSchema, } from '../schemas/basic_type_schemas'; import { + blockParamSchema, + blockRangeSchema, +} from '../schemas/block_range_schema'; +import { ecSignatureParameterSchema, ecSignatureSchema, } from '../schemas/ec_signature_schema'; @@ -56,10 +60,6 @@ import { signedOrdersSchema, } from '../schemas/signed_orders_schema'; import { - blockParamSchema, - subscriptionOptsSchema, -} from '../schemas/subscription_opts_schema'; -import { tokenSchema, } from '../schemas/token_schema'; import { @@ -81,7 +81,7 @@ export const schemas = { signedOrderSchema, signedOrdersSchema, blockParamSchema, - subscriptionOptsSchema, + blockRangeSchema, tokenSchema, jsNumber, txDataSchema, diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index 067b02827..e729c1925 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -23,7 +23,7 @@ const { signedOrderSchema, signedOrdersSchema, blockParamSchema, - subscriptionOptsSchema, + blockRangeSchema, tokenSchema, jsNumber, txDataSchema, @@ -170,21 +170,21 @@ describe('Schema', () => { validateAgainstSchema(testCases, blockParamSchema, shouldFail); }); }); - describe('#subscriptionOptsSchema', () => { + describe('#blockRangeSchema', () => { it('should validate valid subscription opts', () => { const testCases = [ {fromBlock: 42, toBlock: 'latest'}, {fromBlock: 42}, {}, ]; - validateAgainstSchema(testCases, subscriptionOptsSchema); + validateAgainstSchema(testCases, blockRangeSchema); }); it('should fail for invalid subscription opts', () => { const testCases = [ {fromBlock: '42'}, ]; const shouldFail = true; - validateAgainstSchema(testCases, subscriptionOptsSchema, shouldFail); + validateAgainstSchema(testCases, blockRangeSchema, shouldFail); }); }); describe('#tokenSchema', () => { |