From ec198343b551020cfed321937d680af59c2ce127 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 8 Feb 2018 18:07:38 +0100 Subject: Make naming of schemas consistent --- packages/website/ts/schemas/order_schema.ts | 9 --------- packages/website/ts/schemas/portal_order_schema.ts | 9 +++++++++ packages/website/ts/schemas/portal_token_metadata.ts | 10 ++++++++++ packages/website/ts/schemas/token_schema.ts | 10 ---------- packages/website/ts/schemas/validator.ts | 8 ++++---- 5 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 packages/website/ts/schemas/order_schema.ts create mode 100644 packages/website/ts/schemas/portal_order_schema.ts create mode 100644 packages/website/ts/schemas/portal_token_metadata.ts delete mode 100644 packages/website/ts/schemas/token_schema.ts (limited to 'packages/website/ts/schemas') diff --git a/packages/website/ts/schemas/order_schema.ts b/packages/website/ts/schemas/order_schema.ts deleted file mode 100644 index 4d427d8ce..000000000 --- a/packages/website/ts/schemas/order_schema.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const orderSchema = { - id: '/PortalOrder', - properties: { - signedOrder: { $ref: '/SignedOrder' }, - metadata: { $ref: '/OrderMetadata' }, - }, - required: ['signedOrder', 'metadata'], - type: 'object', -}; diff --git a/packages/website/ts/schemas/portal_order_schema.ts b/packages/website/ts/schemas/portal_order_schema.ts new file mode 100644 index 000000000..ea8aeabc6 --- /dev/null +++ b/packages/website/ts/schemas/portal_order_schema.ts @@ -0,0 +1,9 @@ +export const portalOrderSchema = { + id: '/PortalOrder', + properties: { + signedOrder: { $ref: '/SignedOrder' }, + metadata: { $ref: '/OrderMetadata' }, + }, + required: ['signedOrder', 'metadata'], + type: 'object', +}; diff --git a/packages/website/ts/schemas/portal_token_metadata.ts b/packages/website/ts/schemas/portal_token_metadata.ts new file mode 100644 index 000000000..0455c2ac1 --- /dev/null +++ b/packages/website/ts/schemas/portal_token_metadata.ts @@ -0,0 +1,10 @@ +export const portalTokenMetadataSchema = { + id: '/PortalTokenMetadata', + properties: { + name: { type: 'string' }, + symbol: { type: 'string' }, + decimals: { type: 'number' }, + }, + required: ['name', 'symbol', 'decimals'], + type: 'object', +}; diff --git a/packages/website/ts/schemas/token_schema.ts b/packages/website/ts/schemas/token_schema.ts deleted file mode 100644 index 4d1febfee..000000000 --- a/packages/website/ts/schemas/token_schema.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const tokenSchema = { - id: '/PortalTokenMetadata', - properties: { - name: { type: 'string' }, - symbol: { type: 'string' }, - decimals: { type: 'number' }, - }, - required: ['name', 'symbol', 'decimals'], - type: 'object', -}; diff --git a/packages/website/ts/schemas/validator.ts b/packages/website/ts/schemas/validator.ts index f0b5e6676..dac0f0098 100644 --- a/packages/website/ts/schemas/validator.ts +++ b/packages/website/ts/schemas/validator.ts @@ -1,12 +1,12 @@ import { SchemaValidator } from '@0xproject/json-schemas'; import { Schema as JSONSchema, Validator } from 'jsonschema'; import { orderMetadataSchema } from 'ts/schemas/metadata_schema'; -import { orderSchema } from 'ts/schemas/order_schema'; -import { tokenSchema } from 'ts/schemas/token_schema'; +import { portalOrderSchema } from 'ts/schemas/portal_order_schema'; +import { portalTokenMetadataSchema } from 'ts/schemas/portal_token_metadata'; const validator = new SchemaValidator(); -validator.addSchema(tokenSchema); +validator.addSchema(portalTokenMetadataSchema); validator.addSchema(orderMetadataSchema); -validator.addSchema(orderSchema); +validator.addSchema(portalOrderSchema); export { validator }; -- cgit v1.2.3