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

funding: add caller quit channel to waitUntilChannelOpen

Browse Source 
In this commit, we add a caller quit channel to waitUntilChannelOpen.
This ensures that the caller won't block forever if it needs to exit
before the funding manager exits, or the channel barrier is actually
closed.
This commit is contained in:
Olaoluwa Osuntokun 2018-08-24 17:55:53 -07:00
parent e4e4a6ab58
commit 0b5a403fce
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fundingmanager.go
View File

@ -2771,7 +2771,9 @@ func (f *fundingManager) handleInitFundingMsg(msg *initFundingMsg) {
// waitUntilChannelOpen is designed to prevent other lnd subsystems from // waitUntilChannelOpen is designed to prevent other lnd subsystems from
// sending new update messages to a channel before the channel is fully // sending new update messages to a channel before the channel is fully
// opened. // opened.
func (f *fundingManager) waitUntilChannelOpen(targetChan lnwire.ChannelID) { func (f *fundingManager) waitUntilChannelOpen(targetChan lnwire.ChannelID,
quit <-chan struct{}) {
f.barrierMtx.RLock() f.barrierMtx.RLock()
barrier, ok := f.newChanBarriers[targetChan] barrier, ok := f.newChanBarriers[targetChan]
f.barrierMtx.RUnlock() f.barrierMtx.RUnlock()
@ -2781,8 +2783,10 @@ func (f *fundingManager) waitUntilChannelOpen(targetChan lnwire.ChannelID) {
select { select {
case <-barrier: case <-barrier:
case <-f.quit: // TODO(roasbeef): add timer? case <-quit:
break return
case <-f.quit:
return
} }
fndgLog.Tracef("barrier for ChanID(%v) closed", targetChan) fndgLog.Tracef("barrier for ChanID(%v) closed", targetChan)