提交 1a388659 作者: Jeromy 提交者: Juan Batiz-Benet

Address concerns from PR

上级 d1f01124
...@@ -6,8 +6,6 @@ import ( ...@@ -6,8 +6,6 @@ import (
proquint "github.com/bren2010/proquint" proquint "github.com/bren2010/proquint"
) )
var _ = proquint.Encode
type ProquintResolver struct{} type ProquintResolver struct{}
func (r *ProquintResolver) Matches(name string) bool { func (r *ProquintResolver) Matches(name string) bool {
...@@ -16,10 +14,7 @@ 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) { func (r *ProquintResolver) Resolve(name string) (string, error) {
ok, err := proquint.IsProquint(name) ok := r.Matches(name)
if err != nil {
return "", err
}
if !ok { if !ok {
return "", errors.New("not a valid proquint string") return "", errors.New("not a valid proquint string")
} }
......
...@@ -9,12 +9,12 @@ import ( ...@@ -9,12 +9,12 @@ import (
var ErrCouldntResolve = errors.New("could not resolve name.") var ErrCouldntResolve = errors.New("could not resolve name.")
type MasterResolver struct { type masterResolver struct {
res []Resolver res []Resolver
} }
func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResolver { func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) Resolver {
mr := new(MasterResolver) mr := new(masterResolver)
mr.res = []Resolver{ mr.res = []Resolver{
new(DNSResolver), new(DNSResolver),
new(ProquintResolver), new(ProquintResolver),
...@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol ...@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
return mr return mr
} }
func (mr *MasterResolver) Resolve(name string) (string, error) { func (mr *masterResolver) Resolve(name string) (string, error) {
for _, r := range mr.res { for _, r := range mr.res {
if r.Matches(name) { if r.Matches(name) {
return r.Resolve(name) return r.Resolve(name)
...@@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) { ...@@ -32,7 +32,7 @@ func (mr *MasterResolver) Resolve(name string) (string, error) {
return "", ErrCouldntResolve return "", ErrCouldntResolve
} }
func (mr *MasterResolver) Matches(name string) bool { func (mr *masterResolver) Matches(name string) bool {
for _, r := range mr.res { for _, r := range mr.res {
if r.Matches(name) { if r.Matches(name) {
return true return true
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论