funding: decouple funding wait from fundingLocked and chanAnn

This commit decouples the wait for funding transaction confirmations
in the waitForFundingConfirmation function from the announcement of
the channel in the sendFundingLockedAndAnnounceChannel function.
Additionally, the sendFundingLockedAndAnnounceChannel function is
now decoupled into the sendFundingLocked and sendChannelAnnouncement
functions.

fundingmanager.go

@@ -1173,14 +1173,14 @@ func (f *fundingManager) handleFundingCreated(fmsg *fundingCreatedMsg) {
 			}
 			defer lnChannel.Stop()
 
-			if err = f.sendFundingLocked(completeChan, lnChannel,
-				shortChanID); err != nil {
+			err = f.sendFundingLocked(completeChan, lnChannel, shortChanID);
+			if err != nil {
 				fndgLog.Errorf("Failed to send fundingLocked: %v", err)
 				return
 			}
 
-			if err = f.sendChannelAnnouncement(completeChan, lnChannel,
-				shortChanID); err != nil {
+			err = f.sendChannelAnnouncement(completeChan, lnChannel, shortChanID);
+			if err != nil {
 				fndgLog.Errorf("Failed to send channel " +
 					"announcement: %v", err)
 				return