forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-02-26 07:37:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/discover: add context in waitForNodes

Browse source
This commit is contained in:
Felix Lange 2025-08-29 15:47:09 +02:00
parent 46e4f0b5c1
commit f8e0e8dc55
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p2p/discover/table.go
View file

@ -708,7 +708,7 @@ func (tab *Table) deleteNode(n *enode.Node) {
}
// waitForNodes blocks until the table contains at least n nodes.
func (tab *Table) waitForNodes(n int) bool {
func (tab *Table) waitForNodes(ctx context.Context, n int) error {
getlength := func() (count int) {
for _, b := range &tab.buckets {
count += len(b.entries)
@ -721,7 +721,7 @@ func (tab *Table) waitForNodes(n int) bool {
tab.mutex.Lock()
if getlength() >= n {
tab.mutex.Unlock()
return true
return nil
}
if ch == nil {
// Init subscription.
@ -734,8 +734,10 @@ func (tab *Table) waitForNodes(n int) bool {
// Wait for a node add event.
select {
case <-ch:
case <-ctx.Done():
return ctx.Err()
case <-tab.closeReq:
return false
return errClosed
}
}
}