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-bitswap
Commits
f4fae3a4
Commit
f4fae3a4
authored
Apr 14, 2021
by
Cory Schwartz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix staticcheck
parent
0fa39758
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
12 deletions
+8
-12
bitswap_test.go
bitswap_test.go
+2
-3
internal/decision/engine_test.go
internal/decision/engine_test.go
+1
-2
internal/messagequeue/messagequeue.go
internal/messagequeue/messagequeue.go
+1
-2
internal/messagequeue/messagequeue_test.go
internal/messagequeue/messagequeue_test.go
+1
-2
network/ipfs_impl_test.go
network/ipfs_impl_test.go
+3
-3
No files found.
bitswap_test.go
View file @
f4fae3a4
...
...
@@ -12,7 +12,6 @@ import (
deciface
"github.com/ipfs/go-bitswap/decision"
decision
"github.com/ipfs/go-bitswap/internal/decision"
bssession
"github.com/ipfs/go-bitswap/internal/session"
"github.com/ipfs/go-bitswap/message"
bsmsg
"github.com/ipfs/go-bitswap/message"
pb
"github.com/ipfs/go-bitswap/message/pb"
testinstance
"github.com/ipfs/go-bitswap/testinstance"
...
...
@@ -149,7 +148,7 @@ func TestUnwantedBlockNotAdded(t *testing.T) {
net
:=
tn
.
VirtualNetwork
(
mockrouting
.
NewServer
(),
delay
.
Fixed
(
kNetworkDelay
))
block
:=
blocks
.
NewBlock
([]
byte
(
"block"
))
bsMessage
:=
message
.
New
(
true
)
bsMessage
:=
bsmsg
.
New
(
true
)
bsMessage
.
AddBlock
(
block
)
ig
:=
testinstance
.
NewTestInstanceGenerator
(
net
,
nil
,
nil
)
...
...
@@ -215,7 +214,7 @@ func TestPendingBlockAdded(t *testing.T) {
// Simulate receiving a message which contains the block in the "tofetch" queue
lastBlock
:=
blks
[
len
(
blks
)
-
1
]
bsMessage
:=
message
.
New
(
true
)
bsMessage
:=
bsmsg
.
New
(
true
)
bsMessage
.
AddBlock
(
lastBlock
)
unknownPeer
:=
peer
.
ID
(
"QmUHfvCQrzyR6vFXmeyCptfCWedfcmfa12V6UuziDtrw23"
)
instance
.
Exchange
.
ReceiveMessage
(
oneSecCtx
,
unknownPeer
,
bsMessage
)
...
...
internal/decision/engine_test.go
View file @
f4fae3a4
...
...
@@ -183,10 +183,9 @@ func peerIsPartner(p peer.ID, e *Engine) bool {
}
func
TestOutboxClosedWhenEngineClosed
(
t
*
testing
.
T
)
{
ctx
:=
context
.
Background
()
t
.
SkipNow
()
// TODO implement *Engine.Close
e
:=
newEngine
(
blockstore
.
NewBlockstore
(
dssync
.
MutexWrap
(
ds
.
NewMapDatastore
())),
4
,
&
fakePeerTagger
{},
"localhost"
,
0
,
NewTestScoreLedger
(
shortTerm
,
nil
))
e
.
StartWorkers
(
c
tx
,
process
.
WithTeardown
(
func
()
error
{
return
nil
}))
e
.
StartWorkers
(
c
ontext
.
Background
()
,
process
.
WithTeardown
(
func
()
error
{
return
nil
}))
var
wg
sync
.
WaitGroup
wg
.
Add
(
1
)
go
func
()
{
...
...
internal/messagequeue/messagequeue.go
View file @
f4fae3a4
...
...
@@ -9,7 +9,6 @@ import (
bsmsg
"github.com/ipfs/go-bitswap/message"
pb
"github.com/ipfs/go-bitswap/message/pb"
bsnet
"github.com/ipfs/go-bitswap/network"
"github.com/ipfs/go-bitswap/wantlist"
bswl
"github.com/ipfs/go-bitswap/wantlist"
cid
"github.com/ipfs/go-cid"
logging
"github.com/ipfs/go-log"
...
...
@@ -142,7 +141,7 @@ func (r *recallWantlist) RemoveType(c cid.Cid, wtype pb.Message_Wantlist_WantTyp
//
// Returns true if the want was marked as sent. Returns false if the want wasn't
// pending.
func
(
r
*
recallWantlist
)
MarkSent
(
e
wantlist
.
Entry
)
bool
{
func
(
r
*
recallWantlist
)
MarkSent
(
e
bswl
.
Entry
)
bool
{
if
!
r
.
pending
.
RemoveType
(
e
.
Cid
,
e
.
WantType
)
{
return
false
}
...
...
internal/messagequeue/messagequeue_test.go
View file @
f4fae3a4
...
...
@@ -10,7 +10,6 @@ import (
"time"
"github.com/ipfs/go-bitswap/internal/testutil"
"github.com/ipfs/go-bitswap/message"
pb
"github.com/ipfs/go-bitswap/message/pb"
cid
"github.com/ipfs/go-cid"
...
...
@@ -251,7 +250,7 @@ func TestSendingMessagesPriority(t *testing.T) {
if
totalEntriesLength
(
messages
)
!=
len
(
wantHaves
)
+
len
(
wantBlocks
)
{
t
.
Fatal
(
"wrong number of wants"
)
}
byCid
:=
make
(
map
[
cid
.
Cid
]
message
.
Entry
)
byCid
:=
make
(
map
[
cid
.
Cid
]
bsmsg
.
Entry
)
for
_
,
entry
:=
range
messages
[
0
]
{
byCid
[
entry
.
Cid
]
=
entry
}
...
...
network/ipfs_impl_test.go
View file @
f4fae3a4
...
...
@@ -67,7 +67,7 @@ func (r *receiver) PeerDisconnected(p peer.ID) {
r
.
connectionEvent
<-
false
}
var
m
ockNetErr
=
fmt
.
Errorf
(
"network err"
)
var
errM
ockNetErr
=
fmt
.
Errorf
(
"network err"
)
type
ErrStream
struct
{
network
.
Stream
...
...
@@ -115,7 +115,7 @@ func (eh *ErrHost) NewStream(ctx context.Context, p peer.ID, pids ...protocol.ID
defer
eh
.
lk
.
Unlock
()
if
eh
.
err
!=
nil
{
return
nil
,
m
ockNetErr
return
nil
,
errM
ockNetErr
}
if
eh
.
timingOut
{
return
nil
,
context
.
DeadlineExceeded
...
...
@@ -337,7 +337,7 @@ func TestMessageResendAfterError(t *testing.T) {
// Return an error from the networking layer the next time we try to send
// a message
eh
.
setError
(
m
ockNetErr
)
eh
.
setError
(
errM
ockNetErr
)
go
func
()
{
time
.
Sleep
(
testSendErrorBackoff
/
2
)
...
...
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