From b63ee1a4105b0c8cfba3f7d968b6a669d6a3b169 Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Wed, 30 May 2018 12:09:07 +0200
Subject: [PATCH] fundingmanager: fail funding flow on confirmation timeout

---
 fundingmanager.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fundingmanager.go b/fundingmanager.go
index b7b5af8b..8f2ef649 100644
--- a/fundingmanager.go
+++ b/fundingmanager.go
@@ -1441,6 +1441,11 @@ func (f *fundingManager) handleFundingCreated(fmsg *fundingCreatedMsg) {
 		case <-timeoutChan:
 			// We did not see the funding confirmation before
 			// timeout, so we forget the channel.
+			err := fmt.Errorf("timeout waiting for funding tx "+
+				"(%v) to confirm", completeChan.FundingOutpoint)
+			fndgLog.Warnf(err.Error())
+			f.failFundingFlow(fmsg.peerAddress.IdentityKey,
+				pendingChanID, err)
 			deleteFromDatabase()
 			return
 		case <-f.quit: