Remove old DND TXT schema

As for now only dnslink is valid. Fixes ipfs#760 License: MIT Signed-off-by: Jakub (Kubuxu) Sztandera <kubuxu@gmail.com>
Kubuxu · Dec 29, 2015 · f205360 · f205360
1 parent 69e3672
commit f205360
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/namesys/dns.go b/namesys/dns.go
@@ -66,15 +66,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
@@ -19,7 +19,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",
@@ -34,6 +33,7 @@ func TestDnsEntryParsing(t *testing.T) {
 		"dnslink=",
 		"dnslink=/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD/foo",
 		"dnslink=ipns/QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD/bar",
+		"QmY3hE8xgFCjGcz6PHgnvJz5HZi1BaKRfPkn1ghZUcYMjD", // Old schema, no longer valid
 	}
 
 	for _, e := range goodEntries {