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
95b8e09e
Commit
95b8e09e
authored
May 13, 2016
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update deps to introduce yamux hang fix
License: MIT Signed-off-by:
Jeromy
<
why@ipfs.io
>
parent
d00eca48
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
bitswap_test.go
bitswap_test.go
+1
-1
message/message.go
message/message.go
+1
-1
network/interface.go
network/interface.go
+1
-1
network/ipfs_impl.go
network/ipfs_impl.go
+2
-2
testnet/peernet.go
testnet/peernet.go
+1
-1
testutils.go
testutils.go
+1
-1
No files found.
bitswap_test.go
View file @
95b8e09e
...
...
@@ -16,7 +16,7 @@ import (
tn
"github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
mockrouting
"github.com/ipfs/go-ipfs/routing/mock"
delay
"github.com/ipfs/go-ipfs/thirdparty/delay"
p2ptestutil
"gx/ipfs/Qm
cQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8
/go-libp2p/p2p/test/util"
p2ptestutil
"gx/ipfs/Qm
ZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3
/go-libp2p/p2p/test/util"
)
// FIXME the tests are really sensitive to the network delay. fix them to work
...
...
message/message.go
View file @
95b8e09e
...
...
@@ -7,7 +7,7 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
pb
"github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
wantlist
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
inet
"gx/ipfs/Qm
cQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8
/go-libp2p/p2p/net"
inet
"gx/ipfs/Qm
ZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3
/go-libp2p/p2p/net"
ggio
"gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
proto
"gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
...
...
network/interface.go
View file @
95b8e09e
...
...
@@ -4,8 +4,8 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
bsmsg
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
peer
"gx/ipfs/QmZpD74pUj6vuxTp1o6LhA3JavC2Bvh9fsWPPVvHnD9sE7/go-libp2p-peer"
protocol
"gx/ipfs/QmZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3/go-libp2p/p2p/protocol"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
protocol
"gx/ipfs/QmcQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8/go-libp2p/p2p/protocol"
)
var
ProtocolBitswap
protocol
.
ID
=
"/ipfs/bitswap"
...
...
network/ipfs_impl.go
View file @
95b8e09e
...
...
@@ -6,10 +6,10 @@ import (
routing
"github.com/ipfs/go-ipfs/routing"
ma
"gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
peer
"gx/ipfs/QmZpD74pUj6vuxTp1o6LhA3JavC2Bvh9fsWPPVvHnD9sE7/go-libp2p-peer"
host
"gx/ipfs/QmZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3/go-libp2p/p2p/host"
inet
"gx/ipfs/QmZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3/go-libp2p/p2p/net"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
host
"gx/ipfs/QmcQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8/go-libp2p/p2p/host"
inet
"gx/ipfs/QmcQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8/go-libp2p/p2p/net"
)
var
log
=
logging
.
Logger
(
"bitswap_network"
)
...
...
testnet/peernet.go
View file @
95b8e09e
...
...
@@ -6,8 +6,8 @@ import (
mockrouting
"github.com/ipfs/go-ipfs/routing/mock"
testutil
"github.com/ipfs/go-ipfs/thirdparty/testutil"
peer
"gx/ipfs/QmZpD74pUj6vuxTp1o6LhA3JavC2Bvh9fsWPPVvHnD9sE7/go-libp2p-peer"
mockpeernet
"gx/ipfs/QmZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3/go-libp2p/p2p/net/mock"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
mockpeernet
"gx/ipfs/QmcQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8/go-libp2p/p2p/net/mock"
)
type
peernet
struct
{
...
...
testutils.go
View file @
95b8e09e
...
...
@@ -11,8 +11,8 @@ import (
delay
"github.com/ipfs/go-ipfs/thirdparty/delay"
testutil
"github.com/ipfs/go-ipfs/thirdparty/testutil"
peer
"gx/ipfs/QmZpD74pUj6vuxTp1o6LhA3JavC2Bvh9fsWPPVvHnD9sE7/go-libp2p-peer"
p2ptestutil
"gx/ipfs/QmZpVD1kkRwoC67vNknvCrY72pjmVdtZ7txSk8mtCbuwd3/go-libp2p/p2p/test/util"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
p2ptestutil
"gx/ipfs/QmcQTVCQWCN2MYgBHpFXE5S56rcg2mRsxaRgMYmA1UWgA8/go-libp2p/p2p/test/util"
)
// WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!
...
...
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