From afc5c2616acfaf59e8ce716bc9329bc06021dc7a Mon Sep 17 00:00:00 2001 From: fragosti Date: Thu, 2 Aug 2018 11:57:23 -0700 Subject: Enforce stronger naming convention for json schema ids --- .../json-schemas/schemas/basic_type_schemas.ts | 6 ++-- .../json-schemas/schemas/block_range_schema.ts | 8 ++--- packages/json-schemas/schemas/call_data_schema.ts | 12 ++++---- .../json-schemas/schemas/ec_signature_schema.ts | 6 ++-- .../schemas/index_filter_values_schema.ts | 4 +-- .../json-schemas/schemas/order_cancel_schema.ts | 6 ++-- .../schemas/order_fill_or_kill_requests_schema.ts | 6 ++-- .../schemas/order_fill_requests_schema.ts | 6 ++-- packages/json-schemas/schemas/order_hash_schema.ts | 2 +- packages/json-schemas/schemas/order_schemas.ts | 34 +++++++++++----------- packages/json-schemas/schemas/orders_schema.ts | 4 +-- .../schemas/paginated_collection_schema.ts | 2 +- .../relayer_api_asset_pairs_response_schema.ts | 20 ++++++------- .../schemas/relayer_api_error_response_schema.ts | 2 +- .../relayer_api_order_config_payload_schema.ts | 18 ++++++------ .../relayer_api_order_config_response_schema.ts | 10 +++---- .../schemas/relayer_api_order_schema.ts | 6 ++-- .../relayer_api_orderbook_response_schema.ts | 6 ++-- .../relayer_api_orders_channel_subscribe_schema.ts | 20 ++++++------- ...er_api_orders_channel_update_response_schema.ts | 4 +-- .../schemas/relayer_api_orders_response_schema.ts | 6 ++-- .../schemas/relayer_api_orders_schema.ts | 4 +-- .../json-schemas/schemas/signed_orders_schema.ts | 4 +-- packages/json-schemas/schemas/token_schema.ts | 4 +-- packages/json-schemas/schemas/tx_data_schema.ts | 14 ++++----- 25 files changed, 107 insertions(+), 107 deletions(-) (limited to 'packages/json-schemas') diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts index 7565df9e0..031383a11 100644 --- a/packages/json-schemas/schemas/basic_type_schemas.ts +++ b/packages/json-schemas/schemas/basic_type_schemas.ts @@ -1,17 +1,17 @@ export const addressSchema = { - id: '/Address', + id: '/addressSchema', type: 'string', pattern: '^0x[0-9a-f]{40}$', }; export const hexSchema = { - id: '/Hex', + id: '/hexSchema', type: 'string', pattern: '^0x([0-9a-f][0-9a-f])+$', }; export const numberSchema = { - id: '/Number', + id: '/numberSchema', type: 'string', pattern: '^\\d+(\\.\\d+)?$', }; diff --git a/packages/json-schemas/schemas/block_range_schema.ts b/packages/json-schemas/schemas/block_range_schema.ts index 1f6a63151..9eb242fc6 100644 --- a/packages/json-schemas/schemas/block_range_schema.ts +++ b/packages/json-schemas/schemas/block_range_schema.ts @@ -1,5 +1,5 @@ export const blockParamSchema = { - id: '/BlockParam', + id: '/blockParamSchema', oneOf: [ { type: 'number', @@ -11,10 +11,10 @@ export const blockParamSchema = { }; export const blockRangeSchema = { - id: '/BlockRange', + id: '/blockRangeSchema', properties: { - fromBlock: { $ref: '/BlockParam' }, - toBlock: { $ref: '/BlockParam' }, + fromBlock: { $ref: '/blockParamSchema' }, + toBlock: { $ref: '/blockParamSchema' }, }, type: 'object', }; diff --git a/packages/json-schemas/schemas/call_data_schema.ts b/packages/json-schemas/schemas/call_data_schema.ts index b9d00ad2a..4c77d9f9d 100644 --- a/packages/json-schemas/schemas/call_data_schema.ts +++ b/packages/json-schemas/schemas/call_data_schema.ts @@ -1,16 +1,16 @@ export const callDataSchema = { - id: '/CallData', + id: '/callDataSchema', properties: { - from: { $ref: '/Address' }, - to: { $ref: '/Address' }, + from: { $ref: '/addressSchema' }, + to: { $ref: '/addressSchema' }, value: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, gas: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, gasPrice: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, data: { type: 'string', diff --git a/packages/json-schemas/schemas/ec_signature_schema.ts b/packages/json-schemas/schemas/ec_signature_schema.ts index 71b840dd8..c59532f09 100644 --- a/packages/json-schemas/schemas/ec_signature_schema.ts +++ b/packages/json-schemas/schemas/ec_signature_schema.ts @@ -1,5 +1,5 @@ export const ecSignatureParameterSchema = { - id: '/ECSignatureParameter', + id: '/ecSignatureParameterSchema', type: 'string', pattern: '^0[xX][0-9A-Fa-f]{64}$', }; @@ -12,8 +12,8 @@ export const ecSignatureSchema = { minimum: 27, maximum: 28, }, - r: { $ref: '/ECSignatureParameter' }, - s: { $ref: '/ECSignatureParameter' }, + r: { $ref: '/ecSignatureParameterSchema' }, + s: { $ref: '/ecSignatureParameterSchema' }, }, required: ['v', 'r', 's'], type: 'object', diff --git a/packages/json-schemas/schemas/index_filter_values_schema.ts b/packages/json-schemas/schemas/index_filter_values_schema.ts index 3374d63e0..f3c8cef68 100644 --- a/packages/json-schemas/schemas/index_filter_values_schema.ts +++ b/packages/json-schemas/schemas/index_filter_values_schema.ts @@ -1,7 +1,7 @@ export const indexFilterValuesSchema = { - id: '/IndexFilterValues', + id: '/indexFilterValuesSchema', additionalProperties: { - oneOf: [{ $ref: '/Number' }, { $ref: '/Address' }, { $ref: '/OrderHashSchema' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/addressSchema' }, { $ref: '/orderHashSchema' }], }, type: 'object', }; diff --git a/packages/json-schemas/schemas/order_cancel_schema.ts b/packages/json-schemas/schemas/order_cancel_schema.ts index ad23d01cc..e4edfbca9 100644 --- a/packages/json-schemas/schemas/order_cancel_schema.ts +++ b/packages/json-schemas/schemas/order_cancel_schema.ts @@ -1,10 +1,10 @@ export const orderCancellationRequestsSchema = { - id: '/OrderCancellationRequests', + id: '/orderCancellationRequestsSchema', type: 'array', items: { properties: { - order: { $ref: '/Order' }, - takerTokenCancelAmount: { $ref: '/Number' }, + order: { $ref: '/orderSchema' }, + takerTokenCancelAmount: { $ref: '/numberSchema' }, }, required: ['order', 'takerTokenCancelAmount'], type: 'object', diff --git a/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts b/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts index 61f2c8849..e2c18ef0a 100644 --- a/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts +++ b/packages/json-schemas/schemas/order_fill_or_kill_requests_schema.ts @@ -1,10 +1,10 @@ export const orderFillOrKillRequestsSchema = { - id: '/OrderFillOrKillRequests', + id: '/orderFillOrKillRequestsSchema', type: 'array', items: { properties: { - signedOrder: { $ref: '/SignedOrder' }, - fillTakerAmount: { $ref: '/Number' }, + signedOrder: { $ref: '/signedOrderSchema' }, + fillTakerAmount: { $ref: '/numberSchema' }, }, required: ['signedOrder', 'fillTakerAmount'], type: 'object', diff --git a/packages/json-schemas/schemas/order_fill_requests_schema.ts b/packages/json-schemas/schemas/order_fill_requests_schema.ts index 419d0670f..ea8b35e54 100644 --- a/packages/json-schemas/schemas/order_fill_requests_schema.ts +++ b/packages/json-schemas/schemas/order_fill_requests_schema.ts @@ -1,10 +1,10 @@ export const orderFillRequestsSchema = { - id: '/OrderFillRequests', + id: '/orderFillRequestsSchema', type: 'array', items: { properties: { - signedOrder: { $ref: '/SignedOrder' }, - takerTokenFillAmount: { $ref: '/Number' }, + signedOrder: { $ref: '/signedOrderSchema' }, + takerTokenFillAmount: { $ref: '/numberSchema' }, }, required: ['signedOrder', 'takerTokenFillAmount'], type: 'object', diff --git a/packages/json-schemas/schemas/order_hash_schema.ts b/packages/json-schemas/schemas/order_hash_schema.ts index 6af06927f..9773a88f9 100644 --- a/packages/json-schemas/schemas/order_hash_schema.ts +++ b/packages/json-schemas/schemas/order_hash_schema.ts @@ -1,5 +1,5 @@ export const orderHashSchema = { - id: '/OrderHashSchema', + id: '/orderHashSchema', type: 'string', pattern: '^0x[0-9a-fA-F]{64}$', }; diff --git a/packages/json-schemas/schemas/order_schemas.ts b/packages/json-schemas/schemas/order_schemas.ts index dcbfde6e0..eb7fdaf5a 100644 --- a/packages/json-schemas/schemas/order_schemas.ts +++ b/packages/json-schemas/schemas/order_schemas.ts @@ -1,19 +1,19 @@ export const orderSchema = { - id: '/Order', + id: '/orderSchema', properties: { - makerAddress: { $ref: '/Address' }, - takerAddress: { $ref: '/Address' }, - makerFee: { $ref: '/Number' }, - takerFee: { $ref: '/Number' }, - senderAddress: { $ref: '/Address' }, - makerAssetAmount: { $ref: '/Number' }, - takerAssetAmount: { $ref: '/Number' }, - makerAssetData: { $ref: '/Hex' }, - takerAssetData: { $ref: '/Hex' }, - salt: { $ref: '/Number' }, - exchangeAddress: { $ref: '/Address' }, - feeRecipientAddress: { $ref: '/Address' }, - expirationTimeSeconds: { $ref: '/Number' }, + makerAddress: { $ref: '/addressSchema' }, + takerAddress: { $ref: '/addressSchema' }, + makerFee: { $ref: '/numberSchema' }, + takerFee: { $ref: '/numberSchema' }, + senderAddress: { $ref: '/addressSchema' }, + makerAssetAmount: { $ref: '/numberSchema' }, + takerAssetAmount: { $ref: '/numberSchema' }, + makerAssetData: { $ref: '/hexSchema' }, + takerAssetData: { $ref: '/hexSchema' }, + salt: { $ref: '/numberSchema' }, + exchangeAddress: { $ref: '/addressSchema' }, + feeRecipientAddress: { $ref: '/addressSchema' }, + expirationTimeSeconds: { $ref: '/numberSchema' }, }, required: [ 'makerAddress', @@ -34,12 +34,12 @@ export const orderSchema = { }; export const signedOrderSchema = { - id: '/SignedOrder', + id: '/signedOrderSchema', allOf: [ - { $ref: '/Order' }, + { $ref: '/orderSchema' }, { properties: { - signature: { $ref: '/Hex' }, + signature: { $ref: '/hexSchema' }, }, required: ['signature'], }, diff --git a/packages/json-schemas/schemas/orders_schema.ts b/packages/json-schemas/schemas/orders_schema.ts index 73816a57e..de0abcf00 100644 --- a/packages/json-schemas/schemas/orders_schema.ts +++ b/packages/json-schemas/schemas/orders_schema.ts @@ -1,5 +1,5 @@ export const ordersSchema = { - id: '/OrdersSchema', + id: '/ordersSchema', type: 'array', - items: { $ref: '/Order' }, + items: { $ref: '/orderSchema' }, }; diff --git a/packages/json-schemas/schemas/paginated_collection_schema.ts b/packages/json-schemas/schemas/paginated_collection_schema.ts index abd86f1ef..16044c70a 100644 --- a/packages/json-schemas/schemas/paginated_collection_schema.ts +++ b/packages/json-schemas/schemas/paginated_collection_schema.ts @@ -1,5 +1,5 @@ export const paginatedCollectionSchema = { - id: '/PaginatedCollection', + id: '/paginatedCollectionSchema', type: 'object', properties: { total: { type: 'number' }, diff --git a/packages/json-schemas/schemas/relayer_api_asset_pairs_response_schema.ts b/packages/json-schemas/schemas/relayer_api_asset_pairs_response_schema.ts index 74b919a8f..c13396d29 100644 --- a/packages/json-schemas/schemas/relayer_api_asset_pairs_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_asset_pairs_response_schema.ts @@ -1,11 +1,11 @@ export const relayerApiAssetDataPairsResponseSchema = { - id: '/RelayerApiAssetDataPairsResponse', + id: '/relayerApiAssetDataPairsResponseSchema', type: 'object', allOf: [ - { $ref: '/PaginatedCollection' }, + { $ref: '/paginatedCollectionSchema' }, { properties: { - records: { $ref: '/RelayerApiAssetDataPairs' }, + records: { $ref: '/relayerApiAssetDataPairsSchema' }, }, required: ['records'], }, @@ -13,12 +13,12 @@ export const relayerApiAssetDataPairsResponseSchema = { }; export const relayerApiAssetDataPairsSchema = { - id: '/RelayerApiAssetDataPairs', + id: '/relayerApiAssetDataPairsSchema', type: 'array', items: { properties: { - assetDataA: { $ref: '/RelayerApiAssetDataTradeInfo' }, - assetDataB: { $ref: '/RelayerApiAssetDataTradeInfo' }, + assetDataA: { $ref: '/relayerApiAssetDataTradeInfoSchema' }, + assetDataB: { $ref: '/relayerApiAssetDataTradeInfoSchema' }, }, required: ['assetDataA', 'assetDataB'], type: 'object', @@ -26,12 +26,12 @@ export const relayerApiAssetDataPairsSchema = { }; export const relayerApiAssetDataTradeInfoSchema = { - id: '/RelayerApiAssetDataTradeInfo', + id: '/relayerApiAssetDataTradeInfoSchema', type: 'object', properties: { - assetData: { $ref: '/Hex' }, - minAmount: { $ref: '/Number' }, - maxAmount: { $ref: '/Number' }, + assetData: { $ref: '/hexSchema' }, + minAmount: { $ref: '/numberSchema' }, + maxAmount: { $ref: '/numberSchema' }, precision: { type: 'number' }, }, required: ['assetData'], diff --git a/packages/json-schemas/schemas/relayer_api_error_response_schema.ts b/packages/json-schemas/schemas/relayer_api_error_response_schema.ts index 27fdb166f..3a71cdfa6 100644 --- a/packages/json-schemas/schemas/relayer_api_error_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_error_response_schema.ts @@ -1,5 +1,5 @@ export const relayerApiErrorResponseSchema = { - id: '/RelayerApiErrorResponse', + id: '/relayerApiErrorResponseSchema', type: 'object', properties: { code: { type: 'number' }, diff --git a/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.ts b/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.ts index 7b4a88e84..8d1d408d6 100644 --- a/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_order_config_payload_schema.ts @@ -1,15 +1,15 @@ export const relayerApiOrderConfigPayloadSchema = { - id: '/RelayerApiOrderConfigPayload', + id: '/relayerApiOrderConfigPayloadSchema', type: 'object', properties: { - makerAddress: { $ref: '/Address' }, - takerAddress: { $ref: '/Address' }, - makerAssetAmount: { $ref: '/Number' }, - takerAssetAmount: { $ref: '/Number' }, - makerAssetData: { $ref: '/Hex' }, - takerAssetData: { $ref: '/Hex' }, - exchangeAddress: { $ref: '/Address' }, - expirationTimeSeconds: { $ref: '/Number' }, + makerAddress: { $ref: '/addressSchema' }, + takerAddress: { $ref: '/addressSchema' }, + makerAssetAmount: { $ref: '/numberSchema' }, + takerAssetAmount: { $ref: '/numberSchema' }, + makerAssetData: { $ref: '/hexSchema' }, + takerAssetData: { $ref: '/hexSchema' }, + exchangeAddress: { $ref: '/addressSchema' }, + expirationTimeSeconds: { $ref: '/numberSchema' }, }, required: [ 'makerAddress', diff --git a/packages/json-schemas/schemas/relayer_api_order_config_response_schema.ts b/packages/json-schemas/schemas/relayer_api_order_config_response_schema.ts index d7960cd9d..390d0b262 100644 --- a/packages/json-schemas/schemas/relayer_api_order_config_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_order_config_response_schema.ts @@ -1,11 +1,11 @@ export const relayerApiOrderConfigResponseSchema = { - id: '/RelayerApiOrderConfigResponse', + id: '/relayerApiOrderConfigResponseSchema', type: 'object', properties: { - makerFee: { $ref: '/Number' }, - takerFee: { $ref: '/Number' }, - feeRecipientAddress: { $ref: '/Address' }, - senderAddress: { $ref: '/Address' }, + makerFee: { $ref: '/numberSchema' }, + takerFee: { $ref: '/numberSchema' }, + feeRecipientAddress: { $ref: '/addressSchema' }, + senderAddress: { $ref: '/addressSchema' }, }, required: ['makerFee', 'takerFee', 'feeRecipientAddress', 'senderAddress'], }; diff --git a/packages/json-schemas/schemas/relayer_api_order_schema.ts b/packages/json-schemas/schemas/relayer_api_order_schema.ts index 4e138af12..17fa146c4 100644 --- a/packages/json-schemas/schemas/relayer_api_order_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_order_schema.ts @@ -1,9 +1,9 @@ export const relayerApiOrderSchema = { - id: '/RelayerApiOrder', + id: '/relayerApiOrderSchema', type: 'object', properties: { - order: { $ref: '/Order' }, - remainingFillableAmount: { $ref: '/Number' }, + order: { $ref: '/orderSchema' }, + remainingFillableAmount: { $ref: '/numberSchema' }, }, required: ['order', 'remainingFillableAmount'], }; diff --git a/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts b/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts index f311908db..2e5b0c6f2 100644 --- a/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_orderbook_response_schema.ts @@ -1,9 +1,9 @@ export const relayerApiOrderBookResponseSchema = { - id: '/RelayerApiOrderBookResponse', + id: '/relayerApiOrderBookResponseSchema', type: 'object', properties: { - bids: { $ref: '/RelayerApiOrdersResponse' }, - asks: { $ref: '/RelayerApiOrdersResponse' }, + bids: { $ref: '/relayerApiOrdersResponseSchema' }, + asks: { $ref: '/relayerApiOrdersResponseSchema' }, }, required: ['bids', 'asks'], }; 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 d36048047..a3b9b6d95 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 @@ -1,26 +1,26 @@ export const relayerApiOrdersChannelSubscribeSchema = { - id: '/RelayerApiOrdersChannelSubscribe', + id: '/relayerApiOrdersChannelSubscribeSchema', type: 'object', properties: { type: { enum: ['subscribe'] }, channel: { enum: ['orders'] }, requestId: { type: 'string' }, - payload: { $ref: '/RelayerApiOrdersChannelSubscribePayload' }, + payload: { $ref: '/relayerApiOrdersChannelSubscribePayload' }, }, required: ['type', 'channel', 'requestId'], }; export const relayerApiOrdersChannelSubscribePayload = { - id: '/RelayerApiOrdersChannelSubscribePayload', + id: '/relayerApiOrdersChannelSubscribePayload', type: 'object', properties: { - makerAssetProxyId: { $ref: '/Hex' }, - takerAssetProxyId: { $ref: '/Hex' }, + makerAssetProxyId: { $ref: '/hexSchema' }, + takerAssetProxyId: { $ref: '/hexSchema' }, networkId: { type: 'number' }, - makerAssetAddress: { $ref: '/Address' }, - takerAssetAddress: { $ref: '/Address' }, - makerAssetData: { $ref: '/Hex' }, - takerAssetData: { $ref: '/Hex' }, - traderAssetData: { $ref: '/Hex' }, + makerAssetAddress: { $ref: '/addressSchema' }, + takerAssetAddress: { $ref: '/addressSchema' }, + makerAssetData: { $ref: '/hexSchema' }, + takerAssetData: { $ref: '/hexSchema' }, + traderAssetData: { $ref: '/hexSchema' }, }, }; diff --git a/packages/json-schemas/schemas/relayer_api_orders_channel_update_response_schema.ts b/packages/json-schemas/schemas/relayer_api_orders_channel_update_response_schema.ts index 31f5ab389..800b818e2 100644 --- a/packages/json-schemas/schemas/relayer_api_orders_channel_update_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_orders_channel_update_response_schema.ts @@ -1,11 +1,11 @@ export const relayerApiOrdersChannelUpdateSchema = { - id: '/RelayerApiOrdersChannelUpdate', + id: '/relayerApiOrdersChannelUpdateSchema', type: 'object', properties: { type: { enum: ['update'] }, channel: { enum: ['orders'] }, requestId: { type: 'string' }, - payload: { $ref: '/RelayerApiOrders' }, + payload: { $ref: '/relayerApiOrdersSchema' }, }, required: ['type', 'channel', 'requestId'], }; diff --git a/packages/json-schemas/schemas/relayer_api_orders_response_schema.ts b/packages/json-schemas/schemas/relayer_api_orders_response_schema.ts index 4bef260c1..c10d64ca9 100644 --- a/packages/json-schemas/schemas/relayer_api_orders_response_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_orders_response_schema.ts @@ -1,11 +1,11 @@ export const relayerApiOrdersResponseSchema = { - id: '/RelayerApiOrdersResponse', + id: '/relayerApiOrdersResponseSchema', type: 'object', allOf: [ - { $ref: '/PaginatedCollection' }, + { $ref: '/paginatedCollectionSchema' }, { properties: { - records: { $ref: '/RelayerApiOrders' }, + records: { $ref: '/relayerApiOrdersSchema' }, }, required: ['records'], }, diff --git a/packages/json-schemas/schemas/relayer_api_orders_schema.ts b/packages/json-schemas/schemas/relayer_api_orders_schema.ts index da739a300..ba8ce4722 100644 --- a/packages/json-schemas/schemas/relayer_api_orders_schema.ts +++ b/packages/json-schemas/schemas/relayer_api_orders_schema.ts @@ -1,5 +1,5 @@ export const relayerApiOrdersSchema = { - id: '/RelayerApiOrders', + id: '/relayerApiOrdersSchema', type: 'array', - items: { $ref: '/RelayerApiOrder' }, + items: { $ref: '/relayerApiOrderSchema' }, }; diff --git a/packages/json-schemas/schemas/signed_orders_schema.ts b/packages/json-schemas/schemas/signed_orders_schema.ts index 164201f76..e2a5aeb56 100644 --- a/packages/json-schemas/schemas/signed_orders_schema.ts +++ b/packages/json-schemas/schemas/signed_orders_schema.ts @@ -1,5 +1,5 @@ export const signedOrdersSchema = { - id: '/SignedOrdersSchema', + id: '/signedOrdersSchema', type: 'array', - items: { $ref: '/SignedOrder' }, + items: { $ref: '/signedOrderSchema' }, }; diff --git a/packages/json-schemas/schemas/token_schema.ts b/packages/json-schemas/schemas/token_schema.ts index e64565c8b..a0b1ae27f 100644 --- a/packages/json-schemas/schemas/token_schema.ts +++ b/packages/json-schemas/schemas/token_schema.ts @@ -1,10 +1,10 @@ export const tokenSchema = { - id: '/Token', + id: '/tokenSchema', properties: { name: { type: 'string' }, symbol: { type: 'string' }, decimals: { type: 'number' }, - address: { $ref: '/Address' }, + address: { $ref: '/addressSchema' }, }, required: ['name', 'symbol', 'decimals', 'address'], type: 'object', diff --git a/packages/json-schemas/schemas/tx_data_schema.ts b/packages/json-schemas/schemas/tx_data_schema.ts index 4274c553f..41a5c708a 100644 --- a/packages/json-schemas/schemas/tx_data_schema.ts +++ b/packages/json-schemas/schemas/tx_data_schema.ts @@ -1,22 +1,22 @@ export const jsNumber = { - id: '/JsNumber', + id: '/jsNumber', type: 'number', minimum: 0, }; export const txDataSchema = { - id: '/TxData', + id: '/txDataSchema', properties: { - from: { $ref: '/Address' }, - to: { $ref: '/Address' }, + from: { $ref: '/addressSchema' }, + to: { $ref: '/addressSchema' }, value: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, gas: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, gasPrice: { - oneOf: [{ $ref: '/Number' }, { $ref: '/JsNumber' }], + oneOf: [{ $ref: '/numberSchema' }, { $ref: '/jsNumber' }], }, data: { type: 'string', -- cgit v1.2.3