Remove transaction dependency from payment action

Author: tanx

src/action/index.js

@@ -39,7 +39,7 @@ export const info = new InfoAction(store, grpc, nav, notify);
 export const transaction = new TransactionAction(store, grpc, nav);
 export const channel = new ChannelAction(store, grpc, nav, notify);
 export const invoice = new InvoiceAction(store, grpc, nav, notify, Clipboard);
-export const payment = new PaymentAction(store, grpc, transaction, nav, notify);
+export const payment = new PaymentAction(store, grpc, nav, notify);
 export const setting = new SettingAction(store, wallet, db, ipc);
 
 payment.listenForUrl(ipc); // enable incoming url handler

src/action/payment.js

@@ -15,10 +15,9 @@ import {
 import * as log from './log';
 
 class PaymentAction {
-  constructor(store, grpc, transaction, nav, notification) {
+  constructor(store, grpc, nav, notification) {
     this._store = store;
     this._grpc = grpc;
-    this._transaction = transaction;
     this._nav = nav;
     this._notification = notification;
   }
@@ -161,7 +160,6 @@ class PaymentAction {
     } catch (err) {
       this._notification.display({ msg: 'Sending transaction failed!', err });
     }
-    await this._transaction.update();
   }
 
   /**
@@ -192,7 +190,6 @@ class PaymentAction {
       this._nav.goPayLightningConfirm();
       this._notification.display({ msg: 'Lightning payment failed!', err });
     }
-    await this._transaction.update();
   }
 }
 

stories/screen.js

@@ -69,7 +69,7 @@ const transaction = new TransactionAction(store, grpc, nav);
 sinon.stub(transaction, 'update');
 const invoice = new InvoiceAction(store, grpc, nav, notify, Clipboard);
 sinon.stub(invoice, 'generateUri');
-const payment = new PaymentAction(store, grpc, transaction, nav, notify);
+const payment = new PaymentAction(store, grpc, nav, notify);
 sinon.stub(payment, 'checkType');
 sinon.stub(payment, 'payBitcoin');
 sinon.stub(payment, 'payLightning');

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

@@ -152,7 +152,7 @@ describe('Action Integration Tests', function() {
     transactions1 = new TransactionAction(store1, grpc1, nav1);
     channels1 = new ChannelAction(store1, grpc1, nav1, notify1);
     invoice1 = new InvoiceAction(store1, grpc1, nav1, notify1);
-    payments1 = new PaymentAction(store1, grpc1, transactions1, nav1, notify1);
+    payments1 = new PaymentAction(store1, grpc1, nav1, notify1);
 
     db2 = sinon.createStubInstance(AppStorage);
     nav2 = sinon.createStubInstance(NavAction);
@@ -164,7 +164,7 @@ describe('Action Integration Tests', function() {
     transactions2 = new TransactionAction(store2, grpc2, nav2);
     channels2 = new ChannelAction(store2, grpc2, nav2, notify2);
     invoice2 = new InvoiceAction(store2, grpc2, nav2, notify2);
-    payments2 = new PaymentAction(store2, grpc2, transactions2, nav2, notify2);
+    payments2 = new PaymentAction(store2, grpc2, nav2, notify2);
   });
 
   after(async () => {

test/unit/action/payment.spec.js

@@ -3,7 +3,6 @@ import { Store } from '../../../src/store';
 import IpcAction from '../../../src/action/ipc';
 import GrpcAction from '../../../src/action/grpc';
 import PaymentAction from '../../../src/action/payment';
-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';
@@ -13,7 +12,6 @@ describe('Action Payments Unit Tests', () => {
   let store;
   let sandbox;
   let grpc;
-  let transaction;
   let payment;
   let nav;
   let notification;
@@ -27,8 +25,7 @@ describe('Action Payments Unit Tests', () => {
     grpc = sinon.createStubInstance(GrpcAction);
     notification = sinon.createStubInstance(NotificationAction);
     nav = sinon.createStubInstance(NavAction);
-    transaction = sinon.createStubInstance(TransactionAction);
-    payment = new PaymentAction(store, grpc, transaction, nav, notification);
+    payment = new PaymentAction(store, grpc, nav, notification);
   });
 
   afterEach(() => {
@@ -199,14 +196,12 @@ describe('Action Payments Unit Tests', () => {
       });
       expect(nav.goPayBitcoinDone, 'was called once');
       expect(notification.display, 'was not called');
-      expect(transaction.update, 'was called once');
     });
 
     it('should display notification on error', async () => {
       grpc.sendCommand.withArgs('sendCoins').rejects();
       await payment.payBitcoin();
       expect(notification.display, 'was called once');
-      expect(transaction.update, 'was called once');
     });
   });
 
@@ -237,15 +232,13 @@ describe('Action Payments Unit Tests', () => {
       expect(nav.goWait, 'was called once');
       expect(nav.goPayLightningDone, 'was called once');
       expect(notification.display, 'was not called');
-      expect(transaction.update, 'was called once');
     });
 
     it('should display notification on error', async () => {
       paymentsOnStub.withArgs('data').yields({ payment_error: 'Boom!' });
       await payment.payLightning({ invoice: 'some-payment' });
       expect(nav.goPayLightningConfirm, 'was called once');
       expect(notification.display, 'was called once');
-      expect(transaction.update, 'was called once');
     });
   });
 });