Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
592bf6a5
Commit
592bf6a5
authored
Jan 30, 2019
by
Janoš Guljaš
Committed by
Anton Evangelatov
Jan 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swarm: fix flaky delivery tests (#18971)
parent
c5c9cef5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
delivery.go
swarm/network/stream/delivery.go
+0
-7
delivery_test.go
swarm/network/stream/delivery_test.go
+1
-1
No files found.
swarm/network/stream/delivery.go
View file @
592bf6a5
...
@@ -259,13 +259,6 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) (
...
@@ -259,13 +259,6 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) (
if
sp
==
nil
{
if
sp
==
nil
{
return
true
return
true
}
}
// nodes that do not provide stream protocol
// should not be requested, e.g. bootnodes
if
!
p
.
HasCap
(
"stream"
)
{
// TODO: if we have no errors, delete this if
log
.
Error
(
"Delivery.RequestFromPeers: peer doesn't have stream cap. we should have returned at sp == nil"
)
return
true
}
spID
=
&
id
spID
=
&
id
return
false
return
false
})
})
...
...
swarm/network/stream/delivery_test.go
View file @
592bf6a5
...
@@ -285,7 +285,7 @@ func TestRequestFromPeers(t *testing.T) {
...
@@ -285,7 +285,7 @@ func TestRequestFromPeers(t *testing.T) {
addr
:=
network
.
RandomAddr
()
addr
:=
network
.
RandomAddr
()
to
:=
network
.
NewKademlia
(
addr
.
OAddr
,
network
.
NewKadParams
())
to
:=
network
.
NewKademlia
(
addr
.
OAddr
,
network
.
NewKadParams
())
delivery
:=
NewDelivery
(
to
,
nil
)
delivery
:=
NewDelivery
(
to
,
nil
)
protocolsPeer
:=
protocols
.
NewPeer
(
p2p
.
NewPeer
(
dummyPeerID
,
"dummy"
,
[]
p2p
.
Cap
{{
Name
:
"stream"
}}
),
nil
,
nil
)
protocolsPeer
:=
protocols
.
NewPeer
(
p2p
.
NewPeer
(
dummyPeerID
,
"dummy"
,
nil
),
nil
,
nil
)
peer
:=
network
.
NewPeer
(
&
network
.
BzzPeer
{
peer
:=
network
.
NewPeer
(
&
network
.
BzzPeer
{
BzzAddr
:
network
.
RandomAddr
(),
BzzAddr
:
network
.
RandomAddr
(),
LightNode
:
false
,
LightNode
:
false
,
...
...
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