temp changes

fundingmanager.go

@@ -396,7 +396,7 @@ func (f *fundingManager) Start() error {
 				// resume wait on startup.
 			case err = <-errChan:
 				// Encountered an error
-				fndgLog.Errorf("Encountered an error")
+				fndgLog.Errorf("error registering for confirmation: %v", err)
 			case confDetails := <-confirmChan:
 				// Successfully received confirmation details from
 				// confirmChan.  Now we can call processConfirmedFunding
@@ -446,6 +446,7 @@ func (f *fundingManager) Start() error {
 			f.wg.Add(1)
 			go func() {
 				defer f.wg.Done()
+				// TODO - sendFund
 				f.sendFundingLockedAndAnnounceChannel(channel,
 					shortChanID)
 			}()
@@ -1081,13 +1082,13 @@ func (f *fundingManager) handleFundingCreated(fmsg *fundingCreatedMsg) {
 			// wait for funding transaction on startup.
 		case err := <-errChan:
 			// Encountered an error
-			fndgLog.Errorf("Encountered an error: %v", err)
+			fndgLog.Errorf("error waiting for funding transaction to confirm: %v", err)
 		case confDetails := <-confirmChan:
+			// Now we can call processConfirmedFunding
+			f.processConfirmedFunding(completeChan, confDetails)
 			// Success, funding transaction was confirmed.
 			f.deleteReservationCtx(peerKey,
 				fmsg.msg.PendingChannelID)
-			// Now we can call processConfirmedFunding
-			f.processConfirmedFunding(completeChan, confDetails)
 		}
 	}()
 }
@@ -1189,7 +1190,7 @@ func (f *fundingManager) handleFundingSigned(fmsg *fundingSignedMsg) {
 		case <-f.quit:
 			return
 		case err := <-errChan:
-			fndgLog.Errorf("Encountered an error: %v", err)
+			fndgLog.Errorf("error waiting for funding transaction to confirm: %v", err)
 			return
 		case confDetails := <-confirmChan:
 			// Successfully received confirmation details
@@ -1222,8 +1223,8 @@ func (f *fundingManager) handleFundingSigned(fmsg *fundingSignedMsg) {
 // passed from bestHeight. In the case of timeout, the timeoutChan will be
 // closed. In case of confirmation or error, doneChan will be closed.
 func (f *fundingManager) waitForFundingWithTimeout(completeChan *channeldb.OpenChannel,
-	errChan chan<- error, timeoutChan chan<- struct{},
-	confirmChan chan<- *chainntnfs.TxConfirmation) {
+	confirmChan chan<- *chainntnfs.TxConfirmation, timeoutChan chan<- struct{},
+	errChan chan<- error) {
 
 	epochClient, err := f.cfg.Notifier.RegisterBlockEpochNtfn()
 	if err != nil {
@@ -1296,16 +1297,13 @@ func (f *fundingManager) waitForFundingWithTimeout(completeChan *channeldb.OpenC
 // when a channel has become active for lightning transactions.
 // The wait can be canceled by closing the cancelChan.
 func (f *fundingManager) waitForFundingConfirmation(completeChan *channeldb.OpenChannel,
-	cancelChan <-chan struct{}, errChan chan<- error,
-	confirmChan chan<- *chainntnfs.TxConfirmation) {
+	cancelChan <-chan struct{}, confirmChan chan<- *chainntnfs.TxConfirmation,
+	errChan chan<- error) {
 
 	// Register with the ChainNotifier for a notification once the funding
 	// transaction reaches `numConfs` confirmations.
 	txid := completeChan.FundingOutpoint.Hash
 	numConfs := uint32(completeChan.NumConfsRequired)
-	if (numConfs < 6) {
-		numConfs = 6
-	}
 	confNtfn, err := f.cfg.Notifier.RegisterConfirmationsNtfn(&txid,
 		numConfs, completeChan.FundingBroadcastHeight)
 	if err != nil {
@@ -1318,14 +1316,19 @@ func (f *fundingManager) waitForFundingConfirmation(completeChan *channeldb.Open
 	fndgLog.Infof("Waiting for funding tx (%v) to reach %v confirmations",
 		txid, numConfs)
 
-	var confDetails *chainntnfs.TxConfirmation
-	var ok bool
-
 	// Wait until the specified number of confirmations has been reached,
 	// we get a cancel signal, or the wallet signals a shutdown.
 	select {
-	case confDetails, ok = <-confNtfn.Confirmed:
-		// fallthrough
+	case confDetails, ok := <-confNtfn.Confirmed:
+		if !ok {
+			fndgLog.Warnf("ChainNotifier shutting down, cannot complete "+
+				"funding flow for ChannelPoint(%v)",
+				completeChan.FundingOutpoint)
+			return
+		}
+
+		// Send confirmation details to confirmChan for use in processConfirmedFunding
+		confirmChan <- confDetails
 	case <-cancelChan:
 		fndgLog.Warnf("canceled waiting for funding confirmation, "+
 			"stopping funding flow for ChannelPoint(%v)",
@@ -1337,15 +1340,6 @@ func (f *fundingManager) waitForFundingConfirmation(completeChan *channeldb.Open
 		return
 	}
 
-	if !ok {
-		fndgLog.Warnf("ChainNotifier shutting down, cannot complete "+
-			"funding flow for ChannelPoint(%v)",
-			completeChan.FundingOutpoint)
-		return
-	}
-
-	// Send confirmation details to confirmChan for use in processConfirmedFunding
-	confirmChan <- confDetails
 }
 
 // processConfirmedFunding marks a fully confirmed channel as open and available