diff --git a/namesys/dns.go b/namesys/dns.go index 96147534a84..ef5b573631e 100644 --- a/namesys/dns.go +++ b/namesys/dns.go @@ -71,15 +71,6 @@ func (r *DNSResolver) resolveOnce(ctx context.Context, name string) (path.Path, } func parseEntry(txt string) (path.Path, error) { - p, err := path.ParseKeyToPath(txt) // bare IPFS multihashes - if err == nil { - return p, nil - } - - return tryParseDnsLink(txt) -} - -func tryParseDnsLink(txt string) (path.Path, error) { parts := strings.SplitN(txt, "=", 2) if len(parts) == 2 && parts[0] == "dnslink" { return path.ParsePath(parts[1]) diff --git a/namesys/dns_test.go b/namesys/dns_test.go index 27b3883db78..bafce3d3c61 100644 --- a/namesys/dns_test.go +++ b/namesys/dns_test.go @@ -20,7 +20,6 @@ func (m *mockDNS) lookupTXT(name string) (txt []string, err error) { func TestDnsEntryParsing(t *testing.T) { goodEntries := []string{ - "QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD", "dnslink=/ipfs/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD", "dnslink=/ipns/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD", "dnslink=/ipfs/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD/foo", @@ -36,6 +35,7 @@ func TestDnsEntryParsing(t *testing.T) { "dnslink=", "dnslink=/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD/foo", "dnslink=ipns/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD/bar", + "QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD", // Old schema, no longer valid } for _, e := range goodEntries {