Address concerns from PR
Jeromy committed
Sep 16, 2014 at 03:44 UTC
1a3886597d2ce4c0af30a14d7d4d7a5d4753b495
2 files changed
+6
-11
namesys/proquint.go
+1
-6
@@ -6,8 +6,6 @@ import (
6
proquint "github.com/bren2010/proquint"
7
)
8
9
-var _ = proquint.Encode
10
-
9
type ProquintResolver struct{}
10
11
func (r *ProquintResolver) Matches(name string) bool {
@@ -16,10 +14,7 @@ func (r *ProquintResolver) Matches(name string) bool {
14
}
15
16
func (r *ProquintResolver) Resolve(name string) (string, error) {
19
- ok, err := proquint.IsProquint(name)
20
- if err != nil {
21
- return "", err
22
- }
17
+ ok := r.Matches(name)
18
if !ok {
19
return "", errors.New("not a valid proquint string")
20
}
namesys/resolver.go
+5
-5
@@ -9,12 +9,12 @@ import (
9
10
var ErrCouldntResolve = errors.New("could not resolve name.")
11
12
-type MasterResolver struct {
12
+type masterResolver struct {
13
res []Resolver
14
}
15
16
-func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResolver {
17
- mr := new(MasterResolver)
16
+func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) Resolver {
17
+ mr := new(masterResolver)
18
mr.res = []Resolver{
19
new(DNSResolver),
20
new(ProquintResolver),
@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
23
return mr
24
}
25
26
-func (mr *MasterResolver) Resolve(name string) (string, error) {
26
+func (mr *masterResolver) Resolve(name string) (string, error) {
27
for _, r := range mr.res {
28
if r.Matches(name) {
29
return r.Resolve(name)
@@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) {
32
return "", ErrCouldntResolve
33
}
34
35
-func (mr *MasterResolver) Matches(name string) bool {
35
+func (mr *masterResolver) Matches(name string) bool {
36
for _, r := range mr.res {
37
if r.Matches(name) {
38
return true