forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p: adapt to new iterator interface

Browse source
This commit is contained in:
Felix Lange 2019-07-09 13:50:28 +02:00
parent 1fa2bf9e4e
commit 3498a73ec8
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
p2p/dial.go
View file

@ -17,7 +17,6 @@
package p2p package p2p
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"net" "net"
@ -327,13 +326,11 @@ type discoverTask struct {
} }
func (t *discoverTask) Do(srv *Server) { func (t *discoverTask) Do(srv *Server) {
ctx, cancel := context.WithTimeout(context.Background(), discoveryTimeout) t.results = discutil.ReadNodes(srv.discmix, t.want)
defer cancel()
t.results = discutil.ReadNodes(ctx, srv.discmix, t.want)
} }
func (t *discoverTask) String() string { func (t *discoverTask) String() string {
s := "discovery lookup" s := "discovery query"
if len(t.results) > 0 { if len(t.results) > 0 {
s += fmt.Sprintf(" (%d results)", len(t.results)) s += fmt.Sprintf(" (%d results)", len(t.results))
} else { } else {