From 323d2f56311883d59d3828ff2b32a8fdd0bf46e0 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Tue, 28 Jan 2020 14:05:04 +0100
Subject: [PATCH] p2p: ensure dial resolver is truly nil without discovery

---
 p2p/server.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/p2p/server.go b/p2p/server.go
index 553cfb7832..309ff6ae02 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -599,12 +599,14 @@ func (srv *Server) setupDialScheduler() {
 		self:           srv.localnode.ID(),
 		maxDialPeers:   srv.maxDialedConns(),
 		maxActiveDials: srv.MaxPendingPeers,
-		resolver:       srv.ntab,
 		log:            srv.Logger,
 		netRestrict:    srv.NetRestrict,
 		dialer:         srv.Dialer,
 		clock:          srv.clock,
 	}
+	if srv.ntab != nil {
+		config.resolver = srv.ntab
+	}
 	if config.dialer == nil {
 		config.dialer = tcpDialer{&net.Dialer{Timeout: defaultDialTimeout}}
 	}