Remove wallet dependency from transaction action

since wallet balances are now polled

Author: tanx

src/action/index.js

@@ -36,7 +36,7 @@ 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 transaction = new TransactionAction(store, grpc, wallet, nav);
+export const transaction = new TransactionAction(store, grpc, nav);
 export const channel = new ChannelAction(store, grpc, transaction, nav, notify);
 export const invoice = new InvoiceAction(
   store,

src/action/transaction.js

@@ -7,10 +7,9 @@ import * as log from './log';
 import { parseDate, parseSat, toHex } from '../helper';
 
 class TransactionAction {
-  constructor(store, grpc, wallet, nav) {
+  constructor(store, grpc, nav) {
     this._store = store;
     this._grpc = grpc;
-    this._wallet = wallet;
     this._nav = nav;
   }
 
@@ -37,17 +36,15 @@ class TransactionAction {
   }
 
   /**
-   * Update the on-chain transactions, invoice, lighting payments, and wallet
-   * balances in the app state by querying all required grpc apis.
+   * Update the on-chain transactions, invoice, and lighting payments in the
+   * app state by querying all required grpc apis.
    * @return {Promise<undefined>}
    */
   async update() {
     await Promise.all([
       this.getTransactions(),
       this.getInvoices(),
       this.getPayments(),
-      this._wallet.getBalance(),
-      this._wallet.getChannelBalance(),
     ]);
   }
 

stories/screen.js

@@ -65,7 +65,7 @@ sinon.stub(wallet, 'checkSeed');
 sinon.stub(wallet, 'checkNewPassword');
 sinon.stub(wallet, 'checkPassword');
 sinon.stub(wallet, 'getExchangeRate');
-const transaction = new TransactionAction(store, grpc, wallet, nav);
+const transaction = new TransactionAction(store, grpc, nav);
 sinon.stub(transaction, 'update');
 const invoice = new InvoiceAction(
   store,

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

@@ -149,7 +149,7 @@ 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);
-    transactions1 = new TransactionAction(store1, grpc1, wallet1, nav1);
+    transactions1 = new TransactionAction(store1, grpc1, 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);
@@ -161,7 +161,7 @@ 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);
-    transactions2 = new TransactionAction(store2, grpc2, wallet2, nav2);
+    transactions2 = new TransactionAction(store2, grpc2, 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/transaction.spec.js

@@ -1,7 +1,6 @@
 import { Store } from '../../../src/store';
 import GrpcAction from '../../../src/action/grpc';
 import TransactionAction from '../../../src/action/transaction';
-import WalletAction from '../../../src/action/wallet';
 import NavAction from '../../../src/action/nav';
 import * as logger from '../../../src/action/log';
 
@@ -10,7 +9,6 @@ describe('Action Transactions Unit Tests', () => {
   let sandbox;
   let grpc;
   let nav;
-  let wallet;
   let transaction;
 
   beforeEach(() => {
@@ -20,8 +18,7 @@ describe('Action Transactions Unit Tests', () => {
     require('../../../src/config').RETRY_DELAY = 1;
     grpc = sinon.createStubInstance(GrpcAction);
     nav = sinon.createStubInstance(NavAction);
-    wallet = sinon.createStubInstance(WalletAction);
-    transaction = new TransactionAction(store, grpc, wallet, nav);
+    transaction = new TransactionAction(store, grpc, nav);
   });
 
   afterEach(() => {
@@ -48,11 +45,9 @@ describe('Action Transactions Unit Tests', () => {
   });
 
   describe('update()', () => {
-    it('should refresh transactions and balances', async () => {
+    it('should refresh transactions', async () => {
       await transaction.update();
       expect(grpc.sendCommand, 'was called thrice');
-      expect(wallet.getBalance, 'was called once');
-      expect(wallet.getChannelBalance, 'was called once');
     });
   });