highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-11-11 22:57:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc: only cancel closeObserver if force close succeeds

Browse Source
This commit is contained in:
Olaoluwa Osuntokun
2017-12-01 19:11:09 -08:00
parent 4d6cd2ee36
commit 7bd2cd0a16
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rpcserver.go
View File

@@ -824,7 +824,6 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
}
defer func() {
channel.Stop()
channel.CancelObserver()
}()
_, bestHeight, err := r.server.cc.chainIO.GetBestBlock()
@@ -872,6 +871,8 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
},
}
channel.CancelObserver()
errChan = make(chan error, 1)
notifier := r.server.cc.chainNotifier
go waitForChanToClose(uint32(bestHeight), notifier, errChan, chanPoint,