From 23a4dcb729084c0e00c759da487ae3959f436b3a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 8 Jun 2017 18:13:54 +0200 Subject: Add orderFillOrKillRequestsSchema and validate using it instead of looping over the requests and validating them individually --- src/schemas/basic_type_schemas.ts | 11 +++++++++++ src/schemas/order_fill_or_kill_requests_schema.ts | 12 ++++++++++++ src/schemas/order_schemas.ts | 12 ------------ 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 src/schemas/basic_type_schemas.ts create mode 100644 src/schemas/order_fill_or_kill_requests_schema.ts (limited to 'src/schemas') diff --git a/src/schemas/basic_type_schemas.ts b/src/schemas/basic_type_schemas.ts new file mode 100644 index 000000000..c3b81185d --- /dev/null +++ b/src/schemas/basic_type_schemas.ts @@ -0,0 +1,11 @@ +export const addressSchema = { + id: '/addressSchema', + type: 'string', + pattern: '^0[xX][0-9A-Fa-f]{40}$', +}; + +export const numberSchema = { + id: '/numberSchema', + type: 'string', + pattern: '^\\d+(\\.\\d+)?$', +}; diff --git a/src/schemas/order_fill_or_kill_requests_schema.ts b/src/schemas/order_fill_or_kill_requests_schema.ts new file mode 100644 index 000000000..4db7113de --- /dev/null +++ b/src/schemas/order_fill_or_kill_requests_schema.ts @@ -0,0 +1,12 @@ +export const orderFillOrKillRequestsSchema = { + id: '/OrderFillOrKillRequests', + type: 'array', + items: { + properties: { + signedOrder: {$ref: '/signedOrderSchema'}, + fillTakerAmount: {type: '/numberSchema'}, + }, + required: ['signedOrder', 'fillTakerAmount'], + type: 'object', + }, +}; diff --git a/src/schemas/order_schemas.ts b/src/schemas/order_schemas.ts index 4999f3e9d..133736b3d 100644 --- a/src/schemas/order_schemas.ts +++ b/src/schemas/order_schemas.ts @@ -1,15 +1,3 @@ -export const addressSchema = { - id: '/addressSchema', - type: 'string', - pattern: '^0[xX][0-9A-Fa-f]{40}$', -}; - -export const numberSchema = { - id: '/numberSchema', - type: 'string', - pattern: '^\\d+(\\.\\d+)?$', -}; - export const orderSchema = { id: '/orderSchema', properties: { -- cgit v1.2.3