From 44f8d189624281b3f97926aa821faf99ad314ae5 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Jun 2017 14:57:13 +0200 Subject: Add ecSignatureSchema tests --- src/schemas/ec_signature_schema.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/schemas/ec_signature_schema.ts b/src/schemas/ec_signature_schema.ts index e39a8bd70..df1121989 100644 --- a/src/schemas/ec_signature_schema.ts +++ b/src/schemas/ec_signature_schema.ts @@ -1,4 +1,4 @@ -export const ecSignatureParameter = { +export const ecSignatureParameterSchema = { id: '/ecSignatureParameter', type: 'string', pattern: '^0[xX][0-9A-Fa-f]{64}$', -- cgit v1.2.3 From b46ebc76ea727056b3fa15ad814ee9dea511f225 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Jun 2017 15:20:30 +0200 Subject: Add tests for TokenSchema --- src/schemas/token_schema.ts | 7 +++++-- src/utils/schema_validator.ts | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/schemas/token_schema.ts b/src/schemas/token_schema.ts index 01702af68..383c28490 100644 --- a/src/schemas/token_schema.ts +++ b/src/schemas/token_schema.ts @@ -4,8 +4,11 @@ export const tokenSchema = { name: {type: 'string'}, symbol: {type: 'string'}, decimals: {type: 'number'}, - address: {type: 'string'}, - url: {type: 'string'}, + address: {$ref: '/addressSchema'}, + url: { + type: 'string', + format: 'uri', + }, }, required: ['name', 'symbol', 'decimals', 'address', 'url'], type: 'object', diff --git a/src/utils/schema_validator.ts b/src/utils/schema_validator.ts index 72f6afffa..755f6e715 100644 --- a/src/utils/schema_validator.ts +++ b/src/utils/schema_validator.ts @@ -1,5 +1,5 @@ import {Validator, ValidatorResult} from 'jsonschema'; -import {ecSignatureSchema, ecSignatureParameter} from '../schemas/ec_signature_schema'; +import {ecSignatureSchema, ecSignatureParameterSchema} from '../schemas/ec_signature_schema'; import {orderSchema, signedOrderSchema} from '../schemas/order_schemas'; import {addressSchema, numberSchema} from '../schemas/basic_type_schemas'; import {tokenSchema} from '../schemas/token_schema'; @@ -22,7 +22,7 @@ export class SchemaValidator { this.validator.addSchema(addressSchema, addressSchema.id); this.validator.addSchema(ecSignatureSchema, ecSignatureSchema.id); this.validator.addSchema(signedOrderSchema, signedOrderSchema.id); - this.validator.addSchema(ecSignatureParameter, ecSignatureParameter.id); + this.validator.addSchema(ecSignatureParameterSchema, ecSignatureParameterSchema.id); this.validator.addSchema(orderFillOrKillRequestsSchema, orderFillOrKillRequestsSchema.id); } public validate(instance: object, schema: Schema): ValidatorResult { -- cgit v1.2.3 From 36b866dad280006656646a41f7e58a838dbfafe9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Jun 2017 16:41:37 +0200 Subject: Fix tests --- src/schemas/token_schema.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/schemas/token_schema.ts b/src/schemas/token_schema.ts index 383c28490..1236e07c1 100644 --- a/src/schemas/token_schema.ts +++ b/src/schemas/token_schema.ts @@ -6,8 +6,15 @@ export const tokenSchema = { decimals: {type: 'number'}, address: {$ref: '/addressSchema'}, url: { - type: 'string', - format: 'uri', + oneOf: [ + { + type: 'string', + format: 'uri', + }, + { + enum: [''], + }, + ], }, }, required: ['name', 'symbol', 'decimals', 'address', 'url'], -- cgit v1.2.3 From 727f6ad2307e340ed4146af0154098737206a288 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 9 Jun 2017 19:49:35 +0200 Subject: Fix bugs in schemas --- src/schemas/order_cancel_schema.ts | 2 +- src/schemas/order_fill_or_kill_requests_schema.ts | 2 +- src/schemas/order_fill_requests_schema.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/schemas/order_cancel_schema.ts b/src/schemas/order_cancel_schema.ts index 5cc8f745c..04b2c179f 100644 --- a/src/schemas/order_cancel_schema.ts +++ b/src/schemas/order_cancel_schema.ts @@ -4,7 +4,7 @@ export const orderCancellationRequestsSchema = { items: { properties: { order: {$ref: '/orderSchema'}, - takerTokenCancelAmount: {type: '/numberSchema'}, + takerTokenCancelAmount: {$ref: '/numberSchema'}, }, required: ['order', 'takerTokenCancelAmount'], type: 'object', diff --git a/src/schemas/order_fill_or_kill_requests_schema.ts b/src/schemas/order_fill_or_kill_requests_schema.ts index 4db7113de..6f7878c45 100644 --- a/src/schemas/order_fill_or_kill_requests_schema.ts +++ b/src/schemas/order_fill_or_kill_requests_schema.ts @@ -4,7 +4,7 @@ export const orderFillOrKillRequestsSchema = { items: { properties: { signedOrder: {$ref: '/signedOrderSchema'}, - fillTakerAmount: {type: '/numberSchema'}, + fillTakerAmount: {$ref: '/numberSchema'}, }, required: ['signedOrder', 'fillTakerAmount'], type: 'object', diff --git a/src/schemas/order_fill_requests_schema.ts b/src/schemas/order_fill_requests_schema.ts index 44f4e33e2..0f3ee1e99 100644 --- a/src/schemas/order_fill_requests_schema.ts +++ b/src/schemas/order_fill_requests_schema.ts @@ -4,7 +4,7 @@ export const orderFillRequestsSchema = { items: { properties: { signedOrder: {$ref: '/signedOrderSchema'}, - takerTokenFillAmount: {type: '/numberSchema'}, + takerTokenFillAmount: {$ref: '/numberSchema'}, }, required: ['signedOrder', 'takerTokenFillAmount'], type: 'object', -- cgit v1.2.3