From 3498a73ec8df2d329ab4fb7269ea4cccded67e9e Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 9 Jul 2019 13:50:28 +0200
Subject: [PATCH] p2p: adapt to new iterator interface

---
 p2p/dial.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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