Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
1a388659
Commit
1a388659
authored
10 years ago
by
Jeromy
Committed by
Juan Batiz-Benet
10 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address concerns from PR
parent
d1f01124
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
namesys/proquint.go
namesys/proquint.go
+1
-6
namesys/resolver.go
namesys/resolver.go
+5
-5
No files found.
namesys/proquint.go
View file @
1a388659
...
...
@@ -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"
)
}
...
...
This diff is collapsed.
Click to expand it.
namesys/resolver.go
View file @
1a388659
...
...
@@ -9,12 +9,12 @@ import (
var
ErrCouldntResolve
=
errors
.
New
(
"could not resolve name."
)
type
M
asterResolver
struct
{
type
m
asterResolver
struct
{
res
[]
Resolver
}
func
NewMasterResolver
(
r
routing
.
IpfsRouting
,
dag
*
mdag
.
DAGService
)
*
Master
Resolver
{
mr
:=
new
(
M
asterResolver
)
func
NewMasterResolver
(
r
routing
.
IpfsRouting
,
dag
*
mdag
.
DAGService
)
Resolver
{
mr
:=
new
(
m
asterResolver
)
mr
.
res
=
[]
Resolver
{
new
(
DNSResolver
),
new
(
ProquintResolver
),
...
...
@@ -23,7 +23,7 @@ func NewMasterResolver(r routing.IpfsRouting, dag *mdag.DAGService) *MasterResol
return
mr
}
func
(
mr
*
M
asterResolver
)
Resolve
(
name
string
)
(
string
,
error
)
{
func
(
mr
*
m
asterResolver
)
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
*
M
asterResolver
)
Matches
(
name
string
)
bool
{
func
(
mr
*
m
asterResolver
)
Matches
(
name
string
)
bool
{
for
_
,
r
:=
range
mr
.
res
{
if
r
.
Matches
(
name
)
{
return
true
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment