From 962d6e71b6cbe7f4e267bfb16d3c9fb4de511a22 Mon Sep 17 00:00:00 2001 From: fragosti Date: Wed, 1 Aug 2018 13:52:40 -0700 Subject: update orders channel subscribe schema --- .../relayer_api_orders_channel_subscribe_schema.ts | 4 +- packages/json-schemas/test/schema_test.ts | 86 +++------------------- 2 files changed, 14 insertions(+), 76 deletions(-) (limited to 'packages/json-schemas') diff --git a/packages/json-schemas/schemas/relayer_api_orders_channel_subscribe_schema.ts b/packages/json-schemas/schemas/relayer_api_orders_channel_subscribe_schema.ts index 1fe612949..d36048047 100644 --- a/packages/json-schemas/schemas/relayer_api_orders_channel_subscribe_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_orders_channel_subscribe_schema.ts @@ -14,8 +14,8 @@ export const relayerApiOrdersChannelSubscribePayload = { id: '/RelayerApiOrdersChannelSubscribePayload', type: 'object', properties: { - makerAssetProxyId: { $ref: '/Address' }, - takerAssetProxyId: { $ref: '/Address' }, + makerAssetProxyId: { $ref: '/Hex' }, + takerAssetProxyId: { $ref: '/Hex' }, networkId: { type: 'number' }, makerAssetAddress: { $ref: '/Address' }, takerAssetAddress: { $ref: '/Address' }, diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index 7b090ad87..0b520f6e3 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -698,22 +698,22 @@ describe('Schema', () => { type: 'subscribe', channel: 'orders', requestId: 'randomId', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - snapshot: true, - limit: 100, - }, }, { type: 'subscribe', channel: 'orders', requestId: 'randomId', payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', + makerAssetProxyId: '0x02571792', + takerAssetProxyId: '0xf47261b0', }, }, + { + type: 'subscribe', + channel: 'orders', + requestId: 'randomId', + payload: {}, + }, ]; validateAgainstSchema(testCases, relayerApiOrdersChannelSubscribeSchema); }); @@ -723,74 +723,15 @@ describe('Schema', () => { { type: 'subscribe', channel: 'orders', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - snapshot: true, - limit: 100, - }, - }, - { - type: 'foo', - channel: 'orders', - requestId: 'randomId', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - }, - }, - { - type: 'subscribe', - channel: 'bar', - requestId: 'randomId', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - }, - }, - { - type: 'subscribe', - channel: 'orders', - requestId: 'randomId', - payload: { - baseTokenAddress: checksummedAddress, - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - }, - }, - { - type: 'subscribe', - channel: 'orders', - requestId: 'randomId', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: checksummedAddress, - }, - }, - { - type: 'subscribe', - channel: 'orders', - requestId: 'randomId', - payload: { - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - }, - }, - { - type: 'subscribe', - channel: 'orders', - requestId: 'randomId', - payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - }, }, { type: 'subscribe', channel: 'orders', requestId: 'randomId', payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - snapshot: 'true', - limit: 100, + makerAssetProxyId: '0x02571792', + takerAssetProxyId: '0xf47261b0', + makerAssetAddress: checksummedAddress, }, }, { @@ -798,10 +739,7 @@ describe('Schema', () => { channel: 'orders', requestId: 'randomId', payload: { - baseTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - quoteTokenAddress: '0x323b5d4c32345ced77393b3530b1eed0f346429d', - snapshot: true, - limit: '100', + makerAssetProxyId: 'invalidId', }, }, ]; -- cgit v1.2.3