From 1a3886597d2ce4c0af30a14d7d4d7a5d4753b495 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Tue, 16 Sep 2014 03:44:53 +0000
Subject: [PATCH] Address concerns from PR
---
namesys/proquint.go | 7 +------
namesys/resolver.go | 10 +++++-----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/namesys/proquint.go b/namesys/proquint.go
index 8c4db279..9b64f3fd 100644
--- a/namesys/proquint.go
+++ b/namesys/proquint.go
@@ -6,8 +6,6 @@ import (
proquint "github.com/bren2010/proquint"
)
-var _ = proquint.Encode
-
type ProquintResolver struct{}
func (r *ProquintResolver) Matches(name string) bool {
@@ -16,10 +14,7 @@ func (r *ProquintResolver) Matches(name string) bool {
}
func (r *ProquintResolver) Resolve(name string) (string, error) {
- ok, err := proquint.IsProquint(name)
- if err != nil {
- return "", err
- }
+ ok := r.Matches(name)
if !ok {
return "", errors.New("not a valid proquint string")
}
diff --git a/namesys/resolver.go b/namesys/resolver.go
index 2fedf210..7765a4ba 100644
--- a/namesys/resolver.go
+++ b/namesys/resolver.go
@@ -9,12 +9,12 @@ import (
var ErrCouldntResolve = errors.New("could not resolve name.")
-type MasterResolver struct {
+type masterResolver struct {
res []Resolver
}
-func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResolver {
- mr := new(MasterResolver)
+func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) Resolver {
+ mr := new(masterResolver)
mr.res = []Resolver{
new(DNSResolver),
new(ProquintResolver),
@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
return mr
}
-func (mr *MasterResolver) Resolve(name string) (string, error) {
+func (mr *masterResolver) Resolve(name string) (string, error) {
for _, r := range mr.res {
if r.Matches(name) {
return r.Resolve(name)
@@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) {
return "", ErrCouldntResolve
}
-func (mr *MasterResolver) Matches(name string) bool {
+func (mr *masterResolver) Matches(name string) bool {
for _, r := range mr.res {
if r.Matches(name) {
return true
--
GitLab