Set limbo balance during existing pendingchannels grpc call, rather than in a new one.

Author: valentinewallace

src/action/channel.js

@@ -125,7 +125,7 @@ class ChannelAction {
 
   /**
    * List the pending channels by calling the respective grpc api and updating
-   * the pendingChannels array in the global store.
+   * the pendingChannels array and limbo balance in the global store.
    * @return {Promise<undefined>}
    */
   async getPendingChannels() {
@@ -168,6 +168,7 @@ class ChannelAction {
         status: 'waiting-close',
       }));
       this._store.pendingChannels = [].concat(pocs, pccs, pfccs, wccs);
+      this._store.limboBalanceSatoshis = response.totalLimboBalance;
     } catch (err) {
       log.error('Listing pending channels failed', err);
     }

src/action/wallet.js

@@ -144,11 +144,7 @@ class WalletAction {
    * @return {Promise<undefined>}
    */
   async update() {
-    await Promise.all([
-      this.getBalance(),
-      this.getChannelBalance(),
-      this.getLimboBalance(),
-    ]);
+    await Promise.all([this.getBalance(), this.getChannelBalance()]);
   }
 
   /**
@@ -453,20 +449,6 @@ class WalletAction {
     }
   }
 
-  /**
-   * Fetch the limbo balance using the lnd grpc api and set the
-   * corresponding value on the global store.
-   * @return {Promise<undefined>}
-   */
-  async getLimboBalance() {
-    try {
-      const r = await this._grpc.sendCommand('PendingChannels');
-      this._store.limboBalanceSatoshis = r.totalLimboBalance;
-    } catch (err) {
-      log.error('Getting limbo balance failed', err);
-    }
-  }
-
   /**
    * Ensure that the wallet address is non-null before navigating to the
    * NewAddress view during onboarding.

test/unit/action/channel.spec.js

@@ -148,13 +148,15 @@ describe('Action Channels Unit Tests', () => {
         pendingClosingChannels: [{ channel: { ...pendingChannel } }],
         pendingForceClosingChannels: [{ channel: { ...pendingChannel } }],
         waitingCloseChannels: [{ channel: { ...pendingChannel } }],
+        totalLimboBalance: 1,
       });
       await channel.getPendingChannels();
       expect(store.pendingChannels.length, 'to equal', 4);
       expect(store.pendingChannels[0], 'to satisfy', {
         remotePubkey: 'some-key',
         fundingTxId: 'FFFF',
       });
+      expect(store.limboBalanceSatoshis, 'to equal', 1);
     });
 
     it('should log error on failure', async () => {

test/unit/action/wallet.spec.js

@@ -138,7 +138,7 @@ describe('Action Wallet Unit Tests', () => {
     it('should refresh wallet balances', async () => {
       sandbox.stub(wallet, 'pollExchangeRate');
       await wallet.update();
-      expect(grpc.sendCommand, 'was called thrice');
+      expect(grpc.sendCommand, 'was called twice');
       expect(wallet.pollExchangeRate, 'was not called');
     });
   });
@@ -571,22 +571,6 @@ describe('Action Wallet Unit Tests', () => {
     });
   });
 
-  describe('getLimboBalance()', () => {
-    it('should get limbo balance', async () => {
-      grpc.sendCommand.withArgs('PendingChannels').resolves({
-        totalLimboBalance: 1,
-      });
-      await wallet.getLimboBalance();
-      expect(store.limboBalanceSatoshis, 'to equal', 1);
-    });
-
-    it('should log error on failure', async () => {
-      grpc.sendCommand.rejects();
-      await wallet.getLimboBalance();
-      expect(logger.error, 'was called once');
-    });
-  });
-
   describe('getNewAddress()', () => {
     it('should get new address', async () => {
       grpc.sendCommand.withArgs('NewAddress').resolves({