feat(cli): rename channelbalance to balance

ExchangeUnion · Aug 25, 2019 · d69cff1 · d69cff1
1 parent 328d35f
commit d69cff1
Show file tree

Hide file tree

Showing 10 changed files with 364 additions and 279 deletions.
diff --git a/docs/api.md b/docs/api.md
diff --git a/lib/cli/commands/channelbalance.ts → lib/cli/commands/balance.ts b/lib/cli/commands/channelbalance.ts → lib/cli/commands/balance.ts
@@ -1,6 +1,6 @@
 import { callback, loadXudClient } from '../command';
 import { Arguments } from 'yargs';
-import { ChannelBalanceRequest, ChannelBalanceResponse } from '../../proto/xudrpc_pb';
+import { BalanceRequest, BalanceResponse } from '../../proto/xudrpc_pb';
 import { satsToCoinsStr } from '../utils';
 import Table, { HorizontalTable } from 'cli-table3';
 import colors from 'colors/safe';
@@ -11,11 +11,11 @@ const HEADERS = [
   colors.blue('Pending Balance'),
 ];
 
-const formatChannels = (channels: ChannelBalanceResponse.AsObject) => {
+const formatBalances = (balances: BalanceResponse.AsObject) => {
   const formatted: any[] = [];
-  channels.balancesMap.forEach((channel) => {
+  balances.balancesMap.forEach((balance) => {
     const element = [];
-    element.push(channel[0], `${satsToCoinsStr(channel[1].balance)}`, `${satsToCoinsStr(channel[1].pendingOpenBalance)}`);
+    element.push(balance[0], `${satsToCoinsStr(balance[1].balance)}`, `${satsToCoinsStr(balance[1].pendingOpenBalance)}`);
     formatted.push(element);
   });
   return formatted;
@@ -28,17 +28,17 @@ const createTable = () => {
   return table;
 };
 
-const displayChannels = (channels: ChannelBalanceResponse.AsObject) => {
+const displayBalances = (balances: BalanceResponse.AsObject) => {
   const table = createTable();
-  const formatted = formatChannels(channels);
-  formatted.forEach(channel => table.push(channel));
-  console.log(colors.underline(colors.bold('\nChannel balance:')));
+  const formatted = formatBalances(balances);
+  formatted.forEach(balance => table.push(balance));
+  console.log(colors.underline(colors.bold('\nBalance:')));
   console.log(table.toString());
 };
 
-export const command = 'channelbalance [currency]';
+export const command = 'balance [currency]';
 
-export const describe = 'get total channel balance for a given currency';
+export const describe = 'get total balance for a given currency';
 
 export const builder = {
   currency: {
@@ -48,9 +48,9 @@ export const builder = {
 };
 
 export const handler = (argv: Arguments) => {
-  const request = new ChannelBalanceRequest();
+  const request = new BalanceRequest();
   if (argv.currency) {
     request.setCurrency(argv.currency.toUpperCase());
   }
-  loadXudClient(argv).channelBalance(request, callback(argv, displayChannels));
+  loadXudClient(argv).balance(request, callback(argv, displayBalances));
 };
diff --git a/lib/grpc/GrpcService.ts b/lib/grpc/GrpcService.ts
@@ -267,17 +267,17 @@ class GrpcService {
   }
 
   /**
-   * See [[Service.channelBalance]]
+   * See [[Service.balance]]
    */
-  public channelBalance: grpc.handleUnaryCall<xudrpc.ChannelBalanceRequest, xudrpc.ChannelBalanceResponse> = async (call, callback) => {
+  public balance: grpc.handleUnaryCall<xudrpc.BalanceRequest, xudrpc.BalanceResponse> = async (call, callback) => {
     try {
-      const channelBalanceResponse = await this.service.channelBalance(call.request.toObject());
-      const response = new xudrpc.ChannelBalanceResponse();
+      const balanceResponse = await this.service.balance(call.request.toObject());
+      const response = new xudrpc.BalanceResponse();
       const balancesMap = response.getBalancesMap();
-      channelBalanceResponse.forEach((channelBalance, currency) => {
-        const balance = new xudrpc.ChannelBalance();
-        balance.setBalance(channelBalance.balance);
-        balance.setPendingOpenBalance(channelBalance.pendingOpenBalance);
+      balanceResponse.forEach((balanceObj, currency) => {
+        const balance = new xudrpc.Balance();
+        balance.setBalance(balanceObj.balance);
+        balance.setPendingOpenBalance(balanceObj.pendingOpenBalance);
         balancesMap.set(currency, balance);
       });
       callback(null, response);