Merge pull request #539 from lightninglabs/update-wallet-on-channel-event

Update wallet on channel event

Author: valentinewallace

src/action/channel.js

@@ -7,9 +7,10 @@ import { toSatoshis, parseSat } from '../helper';
 import * as log from './log';
 
 class ChannelAction {
-  constructor(store, grpc, nav, notification) {
+  constructor(store, grpc, transaction, nav, notification) {
     this._store = store;
     this._grpc = grpc;
+    this._transaction = transaction;
     this._nav = nav;
     this._notification = notification;
   }
@@ -83,6 +84,7 @@ class ChannelAction {
       this.getPeers(),
       this.getChannels(),
       this.getPendingChannels(),
+      this._transaction.update(),
     ]);
   }
 

src/action/index.js

@@ -36,8 +36,8 @@ export const grpc = new GrpcAction(store, ipc);
 export const notify = new NotificationAction(store, nav);
 export const wallet = new WalletAction(store, grpc, db, nav, notify);
 export const info = new InfoAction(store, grpc, nav, notify);
-export const channel = new ChannelAction(store, grpc, nav, notify);
 export const transaction = new TransactionAction(store, grpc, wallet, nav);
+export const channel = new ChannelAction(store, grpc, transaction, nav, notify);
 export const invoice = new InvoiceAction(
   store,
   grpc,

stories/screen.js

@@ -80,7 +80,7 @@ const payment = new PaymentAction(store, grpc, transaction, nav, notify);
 sinon.stub(payment, 'checkType');
 sinon.stub(payment, 'payBitcoin');
 sinon.stub(payment, 'payLightning');
-const channel = new ChannelAction(store, grpc, nav, notify);
+const channel = new ChannelAction(store, grpc, transaction, nav, notify);
 sinon.stub(channel, 'update');
 sinon.stub(channel, 'connectAndOpen');
 sinon.stub(channel, 'closeSelectedChannel');

test/integration/action/action-integration.spec.js

@@ -151,8 +151,8 @@ describe('Action Integration Tests', function() {
     grpc1 = new GrpcAction(store1, ipc1);
     info1 = new InfoAction(store1, grpc1, nav1, notify1);
     wallet1 = new WalletAction(store1, grpc1, db1, nav1, notify1);
-    channels1 = new ChannelAction(store1, grpc1, nav1, notify1);
     transactions1 = new TransactionAction(store1, grpc1, wallet1, nav1);
+    channels1 = new ChannelAction(store1, grpc1, transactions1, nav1, notify1);
     invoice1 = new InvoiceAction(store1, grpc1, transactions1, nav1, notify1);
     payments1 = new PaymentAction(store1, grpc1, transactions1, nav1, notify1);
 
@@ -163,8 +163,8 @@ describe('Action Integration Tests', function() {
     grpc2 = new GrpcAction(store2, ipc2);
     info2 = new InfoAction(store2, grpc2, nav2, notify2);
     wallet2 = new WalletAction(store2, grpc2, db2, nav2, notify2);
-    channels2 = new ChannelAction(store2, grpc2, nav2, notify2);
     transactions2 = new TransactionAction(store2, grpc2, wallet2, nav2);
+    channels2 = new ChannelAction(store2, grpc2, transactions2, nav2, notify2);
     invoice2 = new InvoiceAction(store2, grpc2, transactions2, nav2, notify2);
     payments2 = new PaymentAction(store2, grpc2, transactions2, nav2, notify2);
   });

test/unit/action/channel.spec.js

@@ -1,6 +1,7 @@
 import { Store } from '../../../src/store';
 import GrpcAction from '../../../src/action/grpc';
 import ChannelAction from '../../../src/action/channel';
+import TransactionAction from '../../../src/action/transaction';
 import NotificationAction from '../../../src/action/notification';
 import NavAction from '../../../src/action/nav';
 import * as logger from '../../../src/action/log';
@@ -15,6 +16,7 @@ describe('Action Channels Unit Tests', () => {
   let grpc;
   let channel;
   let nav;
+  let transaction;
   let notification;
 
   beforeEach(() => {
@@ -24,9 +26,10 @@ describe('Action Channels Unit Tests', () => {
     store.settings.displayFiat = false;
     require('../../../src/config').RETRY_DELAY = 1;
     grpc = sinon.createStubInstance(GrpcAction);
+    transaction = sinon.createStubInstance(TransactionAction);
     notification = sinon.createStubInstance(NotificationAction);
     nav = sinon.createStubInstance(NavAction);
-    channel = new ChannelAction(store, grpc, nav, notification);
+    channel = new ChannelAction(store, grpc, transaction, nav, notification);
   });
 
   afterEach(() => {
@@ -82,6 +85,7 @@ describe('Action Channels Unit Tests', () => {
     it('should refresh channels and peers', async () => {
       await channel.update();
       expect(grpc.sendCommand, 'was called thrice');
+      expect(transaction.update, 'was called once');
     });
   });