Skip to content

Commit

Permalink
refactor(rpc): rename GetOrders to ListOrders (#709)
Browse files Browse the repository at this point in the history
Closes #691.
  • Loading branch information
ImmanuelSegol authored and sangaman committed Dec 25, 2018
1 parent a40b330 commit e102bfd
Show file tree
Hide file tree
Showing 13 changed files with 166 additions and 166 deletions.
48 changes: 24 additions & 24 deletions docs/api.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions lib/cli/commands/getorders.ts → lib/cli/commands/listorders.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Arguments } from 'yargs';
import { callback, loadXudClient } from '../command';
import { GetOrdersRequest, GetOrdersResponse, Order, OrderSide } from '../../proto/xudrpc_pb';
import { ListOrdersRequest, ListOrdersResponse, Order, OrderSide } from '../../proto/xudrpc_pb';
import Table, { HorizontalTable } from 'cli-table3';
import colors from 'colors/safe';

Expand Down Expand Up @@ -38,7 +38,7 @@ const addSide = (orderSide: Order.AsObject[]): string[] => {
}
};

export const formatOrders = (orders: GetOrdersResponse.AsObject) => {
export const formatOrders = (orders: ListOrdersResponse.AsObject) => {
const formattedOrders: FormattedTradingPairOrders[] = [];
orders.ordersMap.forEach((tradingPair) => {
const buy = sortOrders(tradingPair[1].buyOrdersList, true);
Expand Down Expand Up @@ -84,13 +84,13 @@ const displayOrdersTable = (tradingPair: FormattedTradingPairOrders) => {
console.log(table.toString());
};

const displayTables = (orders: GetOrdersResponse.AsObject) => {
const displayTables = (orders: ListOrdersResponse.AsObject) => {
formatOrders(orders).forEach(displayOrdersTable);
};

export const command = 'getorders [pair_id]';
export const command = 'listorders [pair_id]';

export const describe = 'get orders from the order book';
export const describe = 'list orders from the order book';

export const builder = {
pair_id: {
Expand All @@ -99,9 +99,9 @@ export const builder = {
};

export const handler = (argv: Arguments) => {
const request = new GetOrdersRequest();
const request = new ListOrdersRequest();
const pairId = argv.pair_id ? argv.pair_id.toUpperCase() : undefined;
request.setPairId(pairId);
request.setIncludeOwnOrders(true);
loadXudClient(argv).getOrders(request, callback(argv, displayTables));
loadXudClient(argv).listOrders(request, callback(argv, displayTables));
};
2 changes: 1 addition & 1 deletion lib/grpc/GrpcServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class GrpcServer {
executeSwap: grpcService.executeSwap,
getInfo: grpcService.getInfo,
getNodeInfo: grpcService.getNodeInfo,
getOrders: grpcService.getOrders,
listOrders: grpcService.listOrders,
listCurrencies: grpcService.listCurrencies,
listPairs: grpcService.listPairs,
listPeers: grpcService.listPeers,
Expand Down
16 changes: 8 additions & 8 deletions lib/grpc/GrpcService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,24 +355,24 @@ class GrpcService {
}

/**
* See [[Service.getOrders]]
* See [[Service.listOrders]]
*/
public getOrders: grpc.handleUnaryCall<xudrpc.GetOrdersRequest, xudrpc.GetOrdersResponse> = (call, callback) => {
public listOrders: grpc.handleUnaryCall<xudrpc.ListOrdersRequest, xudrpc.ListOrdersResponse> = (call, callback) => {
try {
const getOrdersResponse = this.service.getOrders(call.request.toObject());
const response = new xudrpc.GetOrdersResponse();
const listOrdersResponse = this.service.listOrders(call.request.toObject());
const response = new xudrpc.ListOrdersResponse();

const getOrdersList = <T extends Order>(orders: T[]) => {
const listOrdersList = <T extends Order>(orders: T[]) => {
const ordersList: xudrpc.Order[] = [];
orders.forEach(order => ordersList.push(createOrder(<Order>order)));
return ordersList;
};

const ordersMap = response.getOrdersMap();
getOrdersResponse.forEach((orderArrays, pairId) => {
listOrdersResponse.forEach((orderArrays, pairId) => {
const orders = new xudrpc.Orders();
orders.setBuyOrdersList(getOrdersList(orderArrays.buy));
orders.setSellOrdersList(getOrdersList(orderArrays.sell));
orders.setBuyOrdersList(listOrdersList(orderArrays.buy));
orders.setSellOrdersList(listOrdersList(orderArrays.sell));

ordersMap.set(pairId, orders);
});
Expand Down
28 changes: 14 additions & 14 deletions lib/proto/xudrpc.swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions lib/proto/xudrpc_grpc_pb.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e102bfd

Please sign in to comment.