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
p2p
go-p2p-kad-dht
Commits
f5423a6a
Commit
f5423a6a
authored
Aug 10, 2018
by
Steven Allen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't double-validate values
Also, de-duplicate some logic.
parent
f6a03cbb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
17 deletions
+11
-17
routing.go
routing.go
+11
-17
No files found.
routing.go
View file @
f5423a6a
...
...
@@ -222,30 +222,24 @@ func (dht *IpfsDHT) SearchValue(ctx context.Context, key string, opts ...ropts.O
}
// Select best value
if
best
!=
nil
{
if
bytes
.
Equal
(
best
.
Val
,
v
.
Val
)
{
continue
}
sel
,
err
:=
dht
.
Validator
.
Select
(
key
,
[][]
byte
{
best
.
Val
,
v
.
Val
})
if
err
!=
nil
{
log
.
Warning
(
"Failed to select dht key: "
,
err
)
continue
}
if
sel
==
1
&&
!
bytes
.
Equal
(
v
.
Val
,
best
.
Val
)
{
best
=
&
v
select
{
case
out
<-
v
.
Val
:
case
<-
ctx
.
Done
()
:
return
}
}
}
else
{
// Output first valid value
if
err
:=
dht
.
Validator
.
Validate
(
key
,
v
.
Val
);
err
==
nil
{
best
=
&
v
select
{
case
out
<-
v
.
Val
:
case
<-
ctx
.
Done
()
:
return
}
if
sel
!=
1
{
continue
}
}
best
=
&
v
select
{
case
out
<-
v
.
Val
:
case
<-
ctx
.
Done
()
:
return
}
case
<-
ctx
.
Done
()
:
return
}
...
...
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