Refactor timeout logic

Author: tanx

src/action/payment.js

@@ -170,34 +170,28 @@ class PaymentAction {
    * @return {Promise<undefined>}
    */
   async payLightning() {
+    const to = setTimeout(() => this._nav.goPaymentFailed(), PAYMENT_TIMEOUT);
     try {
       this._nav.goWait();
       const invoice = this._store.payment.address.replace(PREFIX_URI, '');
       const stream = this._grpc.sendStreamCommand('sendPayment');
-      const success = await new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => resolve(false), PAYMENT_TIMEOUT);
+      await new Promise((resolve, reject) => {
         stream.on('data', data => {
           if (data.payment_error) {
-            clearTimeout(timeout);
             reject(new Error(`Lightning payment error: ${data.payment_error}`));
           } else {
-            clearTimeout(timeout);
-            resolve(true);
+            resolve();
           }
         });
-        stream.on('error', () => {
-          clearTimeout(timeout);
-          reject();
-        });
+        stream.on('error', reject);
         stream.write(JSON.stringify({ payment_request: invoice }), 'utf8');
       });
-      if (!success) {
-        this._nav.goPaymentFailed();
-      }
       this._nav.goPayLightningDone();
     } catch (err) {
       this._nav.goPayLightningConfirm();
       this._notification.display({ msg: 'Lightning payment failed!', err });
+    } finally {
+      clearTimeout(to);
     }
   }
 }

test/unit/action/payment.spec.js

@@ -22,7 +22,7 @@ describe('Action Payments Unit Tests', () => {
     store = new Store();
     store.settings.displayFiat = false;
     require('../../../src/config').RETRY_DELAY = 1;
-    require('../../../src/config').PAYMENT_TIMEOUT = 500;
+    require('../../../src/config').PAYMENT_TIMEOUT = 10;
     grpc = sinon.createStubInstance(GrpcAction);
     notification = sinon.createStubInstance(NotificationAction);
     nav = sinon.createStubInstance(NavAction);
@@ -243,9 +243,10 @@ describe('Action Payments Unit Tests', () => {
     });
 
     it('should go to error page on timeout', async () => {
-      await payment.payLightning({ invoice: 'some-invoice' });
+      payment.payLightning({ invoice: 'some-invoice' });
+      await nap(100);
       expect(nav.goPaymentFailed, 'was called once');
-      expect(nav.goPayLightningConfirm, 'was not called');
+      expect(nav.goPayLightningDone, 'was not called');
     });
   });
 });