mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-02-22 14:22:37 +01:00
chaintnfs/btcdnotify: make cancellation of block epoch synchronous
This commit is meant to fix an occasional flake in the interrogation tests cause by the async nature of the cancellation of block epoch notifications. This commit modifies the cancellation to now be fully synchronous which should eliminate this flake.
This commit is contained in:
parent
f9c78b7c2b
commit
c575107607
1 changed files with 14 additions and 3 deletions
|
@ -262,6 +262,8 @@ out:
|
|||
|
||||
close(b.blockEpochClients[msg.epochID])
|
||||
delete(b.blockEpochClients, msg.epochID)
|
||||
|
||||
close(msg.done)
|
||||
}
|
||||
case registerMsg := <-b.notificationRegistry:
|
||||
switch msg := registerMsg.(type) {
|
||||
|
@ -707,6 +709,8 @@ type blockEpochRegistration struct {
|
|||
// cancel an outstanding epoch notification that has yet to be dispatched.
|
||||
type epochCancel struct {
|
||||
epochID uint64
|
||||
|
||||
done chan struct{}
|
||||
}
|
||||
|
||||
// RegisterBlockEpochNtfn returns a BlockEpochEvent which subscribes the
|
||||
|
@ -726,10 +730,17 @@ func (b *BtcdNotifier) RegisterBlockEpochNtfn() (*chainntnfs.BlockEpochEvent, er
|
|||
return &chainntnfs.BlockEpochEvent{
|
||||
Epochs: registration.epochChan,
|
||||
Cancel: func() {
|
||||
select {
|
||||
case b.notificationCancels <- &epochCancel{
|
||||
cancel := &epochCancel{
|
||||
epochID: registration.epochID,
|
||||
}:
|
||||
done: make(chan struct{}),
|
||||
}
|
||||
|
||||
select {
|
||||
case b.notificationCancels <- cancel:
|
||||
select {
|
||||
case <-cancel.done:
|
||||
case <-b.quit:
|
||||
}
|
||||
case <-b.quit:
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue