LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

chain: ensure clientMtx is never locked while waiting on channel

Browse source
This commit is contained in:
Alex 2017-09-21 16:17:09 -06:00 committed by Olaoluwa Osuntokun
parent 5c69110f47
commit d7ad221ee0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chain/neutrino.go
View file

@ -62,7 +62,6 @@ func (s *NeutrinoClient) Start() error {
select {
case s.enqueueNotification <- ClientConnected{}:
case <-s.quit:
return
}
}()
go s.notificationHandler()
@ -174,7 +173,9 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []btcutil.Addre
if s.scanning {
// Restart the rescan by killing the existing rescan.
close(s.rescanQuit)
s.clientMtx.Unlock()
s.rescan.WaitForShutdown()
s.clientMtx.Lock()
}
s.rescanQuit = make(chan struct{})
s.scanning = true
@ -195,6 +196,7 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []btcutil.Addre
// notification indicating the rescan has "finished".
if header.BlockHash() == *startHash {
s.finished = true
s.clientMtx.Unlock()
select {
case s.enqueueNotification <- &RescanFinished{
Hash: startHash,
@ -206,6 +208,7 @@ func (s *NeutrinoClient) Rescan(startHash *chainhash.Hash, addrs []btcutil.Addre
case <-s.rescanQuit:
return nil
}
s.clientMtx.Lock()
}
s.rescan = s.CS.NewRescan(