Merge pull request #3 from starius/reregister-fixes

staticaddr reregister: fixed two bugs and added test coverage

Author: hieblmi

staticaddr/loopin/actions.go

@@ -575,6 +575,10 @@ func (f *FSM) MonitorInvoiceAndHtlcTxAction(ctx context.Context,
 			f.Errorf("htlc tx conf chan error, re-registering: "+
 				"%v", err)
 
+			// A previous confirmation may no longer be valid if the
+			// subscription failed, so reset and wait for a fresh one.
+			htlcConfirmed = false
+
 			// Re-register for htlc confirmation.
 			htlcConfChan, htlcErrConfChan, err = registerHtlcConf()
 			if err != nil {
@@ -695,6 +699,8 @@ func (f *FSM) MonitorInvoiceAndHtlcTxAction(ctx context.Context,
 		case err = <-invoiceErrChan:
 			f.Errorf("invoice subscription error: %v", err)
 
+			return f.HandleError(err)
+
 		case <-ctx.Done():
 			return f.HandleError(ctx.Err())
 		}