highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-08-03 18:22:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fundingmanager: properly stop channel on error

Browse Source
This commit is contained in:
Johan T. Halseth
2018-06-19 12:48:38 +01:00
parent 55c8741e42
commit b56d922ce2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fundingmanager.go
View File

@@ -1616,9 +1616,7 @@ func (f *fundingManager) handleFundingSigned(fmsg *fundingSignedMsg) {
fndgLog.Errorf("failed creating lnChannel: %v", err) fndgLog.Errorf("failed creating lnChannel: %v", err)
return return
} }
defer func() { defer lnChannel.Stop()
lnChannel.Stop()
}()
err = f.sendFundingLocked(completeChan, lnChannel, shortChanID) err = f.sendFundingLocked(completeChan, lnChannel, shortChanID)
if err != nil { if err != nil {
@@ -1879,9 +1877,7 @@ func (f *fundingManager) handleFundingConfirmation(completeChan *channeldb.OpenC
if err != nil { if err != nil {
return err return err
} }
defer func() { defer lnChannel.Stop()
lnChannel.Stop()
}()
chanID := lnwire.NewChanIDFromOutPoint(&completeChan.FundingOutpoint) chanID := lnwire.NewChanIDFromOutPoint(&completeChan.FundingOutpoint)
@@ -2224,6 +2220,7 @@ func (f *fundingManager) handleFundingLocked(fmsg *fundingLockedMsg) {
err = channel.InitNextRevocation(fmsg.msg.NextPerCommitmentPoint) err = channel.InitNextRevocation(fmsg.msg.NextPerCommitmentPoint)
if err != nil { if err != nil {
fndgLog.Errorf("unable to insert next commitment point: %v", err) fndgLog.Errorf("unable to insert next commitment point: %v", err)
channel.Stop()
return return
} }
@@ -2249,6 +2246,7 @@ func (f *fundingManager) handleFundingLocked(fmsg *fundingLockedMsg) {
peer, err := f.cfg.FindPeer(fmsg.peerAddress.IdentityKey) peer, err := f.cfg.FindPeer(fmsg.peerAddress.IdentityKey)
if err != nil { if err != nil {
fndgLog.Errorf("Unable to find peer: %v", err) fndgLog.Errorf("Unable to find peer: %v", err)
channel.Stop()
return return
} }
newChanDone := make(chan struct{}) newChanDone := make(chan struct{})