From 55cb76d4f360ccd35aadb0011f89eda4322212f3 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 9 May 2018 08:14:01 +0100 Subject: [PATCH] consolidate dns resolver constructors The current convention is to return the concrete type instead of an interface so let's go with that and have one constructor. License: MIT Signed-off-by: Steven Allen --- namesys/dns.go | 8 +------- namesys/namesys.go | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/namesys/dns.go b/namesys/dns.go index 6d74e5221..de1d7cb49 100644 --- a/namesys/dns.go +++ b/namesys/dns.go @@ -21,13 +21,7 @@ type DNSResolver struct { } // NewDNSResolver constructs a name resolver using DNS TXT records. -func NewDNSResolver() Resolver { - return &DNSResolver{lookupTXT: net.LookupTXT} -} - -// newDNSResolver constructs a name resolver using DNS TXT records, -// returning a resolver instead of NewDNSResolver's Resolver. -func newDNSResolver() resolver { +func NewDNSResolver() *DNSResolver { return &DNSResolver{lookupTXT: net.LookupTXT} } diff --git a/namesys/namesys.go b/namesys/namesys.go index 6e37d1c6f..c1f3f7c6d 100644 --- a/namesys/namesys.go +++ b/namesys/namesys.go @@ -35,7 +35,7 @@ type mpns struct { func NewNameSystem(r routing.ValueStore, ds ds.Datastore, cachesize int) NameSystem { return &mpns{ resolvers: map[string]resolver{ - "dns": newDNSResolver(), + "dns": NewDNSResolver(), "proquint": new(ProquintResolver), "dht": NewRoutingResolver(r, cachesize), },