crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove chainId from the orderbook pacakge

Browse Source
This commit is contained in:
fragosti 2019-11-08 16:32:22 -08:00
parent 6252446bd3
commit 8a8ec79c6c
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/orderbook/src/order_provider/base_sra_order_provider.ts
View File

@ -10,17 +10,15 @@ export const PER_PAGE_DEFAULT = 100;
export abstract class BaseSRAOrderProvider extends BaseOrderProvider { export abstract class BaseSRAOrderProvider extends BaseOrderProvider {
protected readonly _httpClient: HttpClient; protected readonly _httpClient: HttpClient;
protected readonly _chainId?: number;
protected readonly _perPage: number; protected readonly _perPage: number;
/** /**
* This is an internal class for Websocket and Polling Order Providers * This is an internal class for Websocket and Polling Order Providers
*/ */
constructor(orderStore: OrderStore, httpEndpoint: string, perPage: number = PER_PAGE_DEFAULT, chainId?: number) { constructor(orderStore: OrderStore, httpEndpoint: string, perPage: number = PER_PAGE_DEFAULT) {
super(orderStore); super(orderStore);
this._httpClient = new HttpClient(httpEndpoint); this._httpClient = new HttpClient(httpEndpoint);
this._perPage = perPage; this._perPage = perPage;
this._chainId = chainId;
} }
/** /**
@ -30,7 +28,6 @@ export abstract class BaseSRAOrderProvider extends BaseOrderProvider {
public async getAvailableAssetDatasAsync(): Promise<AssetPairsItem[]> { public async getAvailableAssetDatasAsync(): Promise<AssetPairsItem[]> {
const requestOpts = { const requestOpts = {
perPage: this._perPage, perPage: this._perPage,
chainId: this._chainId,
}; };
let recordsToReturn: AssetPairsItem[] = []; let recordsToReturn: AssetPairsItem[] = [];
@ -60,7 +57,7 @@ export abstract class BaseSRAOrderProvider extends BaseOrderProvider {
const rejected: RejectedOrder[] = []; const rejected: RejectedOrder[] = [];
for (const order of orders) { for (const order of orders) {
try { try {
await this._httpClient.submitOrderAsync(order, { chainId: this._chainId }); await this._httpClient.submitOrderAsync(order);
accepted.push(order); accepted.push(order);
} catch (e) { } catch (e) {
rejected.push({ order, message: e.message }); rejected.push({ order, message: e.message });
@ -83,7 +80,6 @@ export abstract class BaseSRAOrderProvider extends BaseOrderProvider {
makerAssetData, makerAssetData,
takerAssetData, takerAssetData,
perPage: this._perPage, perPage: this._perPage,
chainId: this._chainId,
}; };
let hasMorePages = true; let hasMorePages = true;

2
packages/orderbook/src/order_provider/sra_polling_order_provider.ts
View File

@ -18,7 +18,7 @@ export class SRAPollingOrderProvider extends BaseSRAOrderProvider {
* @param orderStore The `OrderStore` where orders are added and removed from * @param orderStore The `OrderStore` where orders are added and removed from
*/ */
constructor(opts: SRAPollingOrderProviderOpts, orderStore: OrderStore) { constructor(opts: SRAPollingOrderProviderOpts, orderStore: OrderStore) {
super(orderStore, opts.httpEndpoint, opts.perPage, opts.chainId); super(orderStore, opts.httpEndpoint, opts.perPage);
assert.isNumber('pollingIntervalMs', opts.pollingIntervalMs); assert.isNumber('pollingIntervalMs', opts.pollingIntervalMs);
this._pollingIntervalMs = opts.pollingIntervalMs; this._pollingIntervalMs = opts.pollingIntervalMs;
} }

4
packages/orderbook/src/order_provider/sra_websocket_order_provider.ts
View File

@ -28,7 +28,7 @@ export class SRAWebsocketOrderProvider extends BaseSRAOrderProvider {
* @param orderStore The `OrderStore` where orders are added and removed from * @param orderStore The `OrderStore` where orders are added and removed from
*/ */
constructor(opts: SRAWebsocketOrderProviderOpts, orderStore: OrderStore) { constructor(opts: SRAWebsocketOrderProviderOpts, orderStore: OrderStore) {
super(orderStore, opts.httpEndpoint, PER_PAGE_DEFAULT, opts.chainId); super(orderStore, opts.httpEndpoint, PER_PAGE_DEFAULT);
assert.isUri('websocketEndpoint', opts.websocketEndpoint); assert.isUri('websocketEndpoint', opts.websocketEndpoint);
this._websocketEndpoint = opts.websocketEndpoint; this._websocketEndpoint = opts.websocketEndpoint;
} }
@ -125,7 +125,7 @@ export class SRAWebsocketOrderProvider extends BaseSRAOrderProvider {
const ordersChannelHandler: OrdersChannelHandler = { const ordersChannelHandler: OrdersChannelHandler = {
onUpdate: async (_channel, _opts, apiOrders) => this._handleOrderUpdates(apiOrders), onUpdate: async (_channel, _opts, apiOrders) => this._handleOrderUpdates(apiOrders),
// tslint:disable-next-line:no-empty // tslint:disable-next-line:no-empty
onError: (_channel, _err) => {}, onError: (_channel, _err) => { },
onClose: async () => { onClose: async () => {
// Do not reconnect if destroyed // Do not reconnect if destroyed
if (this._isDestroyed) { if (this._isDestroyed) {

2
packages/orderbook/src/types.ts
View File

@ -26,8 +26,6 @@ export interface SRAWebsocketOrderProviderOpts {
httpEndpoint: string; httpEndpoint: string;
// The websocket endpoint to the SRA service, e.g wss://ws.sra.0x.org/ // The websocket endpoint to the SRA service, e.g wss://ws.sra.0x.org/
websocketEndpoint: string; websocketEndpoint: string;
// The chain Id
chainId?: number;
} }
/** /**