akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

funding: add a conditional send on quit for all process* methods

Browse Source 
This commit adds a conditional send on quit to all methods used by
outside sub-systems to the funding manager. This ensures, that in the
case the funding manager is exiting, the caller won’t block
indefinitely.
This commit is contained in:
Olaoluwa Osuntokun 2017-09-27 20:06:57 -07:00
parent a34bf6abea
commit c06b82c3a2
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fundingmanager.go
View File

@ -639,7 +639,11 @@ func (f *fundingManager) handlePendingChannels(msg *pendingChansReq) {
func (f *fundingManager) processFundingOpen(msg *lnwire.OpenChannel, func (f *fundingManager) processFundingOpen(msg *lnwire.OpenChannel,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingOpenMsg{msg, peerAddress} select {
case f.fundingMsgs <- &fundingOpenMsg{msg, peerAddress}:
case <-f.quit:
return
}
} }
// handleFundingOpen creates an initial 'ChannelReservation' within the wallet, // handleFundingOpen creates an initial 'ChannelReservation' within the wallet,
@ -834,7 +838,11 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
func (f *fundingManager) processFundingAccept(msg *lnwire.AcceptChannel, func (f *fundingManager) processFundingAccept(msg *lnwire.AcceptChannel,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingAcceptMsg{msg, peerAddress} select {
case f.fundingMsgs <- &fundingAcceptMsg{msg, peerAddress}:
case <-f.quit:
return
}
} }
// handleFundingAceept processes a response to the workflow initiation sent by // handleFundingAceept processes a response to the workflow initiation sent by
@ -967,7 +975,11 @@ func (f *fundingManager) handleFundingAccept(fmsg *fundingAcceptMsg) {
func (f *fundingManager) processFundingCreated(msg *lnwire.FundingCreated, func (f *fundingManager) processFundingCreated(msg *lnwire.FundingCreated,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingCreatedMsg{msg, peerAddress} select {
case f.fundingMsgs <- &fundingCreatedMsg{msg, peerAddress}:
case <-f.quit:
return
}
} }
// handleFundingCreated progresses the funding workflow when the daemon is on // handleFundingCreated progresses the funding workflow when the daemon is on
@ -1114,7 +1126,11 @@ func (f *fundingManager) handleFundingCreated(fmsg *fundingCreatedMsg) {
func (f *fundingManager) processFundingSigned(msg *lnwire.FundingSigned, func (f *fundingManager) processFundingSigned(msg *lnwire.FundingSigned,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingSignedMsg{msg, peerAddress} select {
case f.fundingMsgs <- &fundingSignedMsg{msg, peerAddress}:
case <-f.quit:
return
}
} }
// handleFundingSigned processes the final message received in a single funder // handleFundingSigned processes the final message received in a single funder
@ -1494,7 +1510,11 @@ func (f *fundingManager) sendChannelAnnouncement(completeChan *channeldb.OpenCha
func (f *fundingManager) processFundingLocked(msg *lnwire.FundingLocked, func (f *fundingManager) processFundingLocked(msg *lnwire.FundingLocked,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingLockedMsg{msg, peerAddress} select {
case f.fundingMsgs <- &fundingLockedMsg{msg, peerAddress}:
case <-f.quit:
return
}
} }
// handleFundingLocked finalizes the channel funding process and enables the // handleFundingLocked finalizes the channel funding process and enables the
@ -1922,7 +1942,11 @@ func (f *fundingManager) waitUntilChannelOpen(targetChan lnwire.ChannelID) {
func (f *fundingManager) processFundingError(err *lnwire.Error, func (f *fundingManager) processFundingError(err *lnwire.Error,
peerAddress *lnwire.NetAddress) { peerAddress *lnwire.NetAddress) {
f.fundingMsgs <- &fundingErrorMsg{err, peerAddress} select {
case f.fundingMsgs <- &fundingErrorMsg{err, peerAddress}:
case <-f.quit:
return
}
} }
// handleErrorGenericMsg process the error which was received from remote peer, // handleErrorGenericMsg process the error which was received from remote peer,