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
5df2fc06
Commit
5df2fc06
authored
Jan 31, 2016
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update libp2p dep
License: MIT Signed-off-by:
Jeromy
<
jeromyj@gmail.com
>
parent
e0d6a64b
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
21 additions
and
21 deletions
+21
-21
bitswap.go
bitswap.go
+1
-1
bitswap_test.go
bitswap_test.go
+1
-1
decision/bench_test.go
decision/bench_test.go
+1
-1
decision/engine.go
decision/engine.go
+1
-1
decision/engine_test.go
decision/engine_test.go
+1
-1
decision/ledger.go
decision/ledger.go
+1
-1
decision/peer_request_queue.go
decision/peer_request_queue.go
+1
-1
message/message.go
message/message.go
+1
-1
network/interface.go
network/interface.go
+2
-2
network/ipfs_impl.go
network/ipfs_impl.go
+3
-3
testnet/interface.go
testnet/interface.go
+1
-1
testnet/network_test.go
testnet/network_test.go
+1
-1
testnet/peernet.go
testnet/peernet.go
+2
-2
testnet/virtual.go
testnet/virtual.go
+1
-1
testutils.go
testutils.go
+2
-2
wantmanager.go
wantmanager.go
+1
-1
No files found.
bitswap.go
View file @
5df2fc06
...
...
@@ -20,7 +20,7 @@ import (
notifications
"github.com/ipfs/go-ipfs/exchange/bitswap/notifications"
wantlist
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
"github.com/ipfs/go-ipfs/thirdparty/delay"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
...
...
bitswap_test.go
View file @
5df2fc06
...
...
@@ -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
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/test/util"
p2ptestutil
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/test/util"
)
// FIXME the tests are really sensitive to the network delay. fix them to work
...
...
decision/bench_test.go
View file @
5df2fc06
...
...
@@ -7,7 +7,7 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
"github.com/ipfs/go-ipfs/util/testutil"
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
)
// FWIW: At the time of this commit, including a timestamp in task increases
...
...
decision/engine.go
View file @
5df2fc06
...
...
@@ -8,7 +8,7 @@ import (
bstore
"github.com/ipfs/go-ipfs/blocks/blockstore"
bsmsg
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
wl
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
...
...
decision/engine_test.go
View file @
5df2fc06
...
...
@@ -14,7 +14,7 @@ import (
blockstore
"github.com/ipfs/go-ipfs/blocks/blockstore"
message
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
testutil
"github.com/ipfs/go-ipfs/util/testutil"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
decision/ledger.go
View file @
5df2fc06
...
...
@@ -5,7 +5,7 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
wl
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
)
// keySet is just a convenient alias for maps of keys, where we only care
...
...
decision/peer_request_queue.go
View file @
5df2fc06
...
...
@@ -7,7 +7,7 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
wantlist
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
pq
"github.com/ipfs/go-ipfs/thirdparty/pq"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
)
type
peerRequestQueue
interface
{
...
...
message/message.go
View file @
5df2fc06
...
...
@@ -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
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/net"
inet
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/net"
ggio
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/io"
proto
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
...
...
network/interface.go
View file @
5df2fc06
...
...
@@ -3,8 +3,8 @@ package network
import
(
key
"github.com/ipfs/go-ipfs/blocks/key"
bsmsg
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
protocol
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/protocol"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
protocol
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/protocol"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
network/ipfs_impl.go
View file @
5df2fc06
...
...
@@ -4,10 +4,10 @@ import (
key
"github.com/ipfs/go-ipfs/blocks/key"
bsmsg
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
routing
"github.com/ipfs/go-ipfs/routing"
host
"gx/ipfs/QmQQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn/go-libp2p/p2p/host"
inet
"gx/ipfs/QmQQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn/go-libp2p/p2p/net"
peer
"gx/ipfs/QmQQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn/go-libp2p/p2p/peer"
ma
"gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
host
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/host"
inet
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/net"
peer
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
logging
"gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
...
...
testnet/interface.go
View file @
5df2fc06
...
...
@@ -3,7 +3,7 @@ package bitswap
import
(
bsnet
"github.com/ipfs/go-ipfs/exchange/bitswap/network"
"github.com/ipfs/go-ipfs/util/testutil"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
)
type
Network
interface
{
...
...
testnet/network_test.go
View file @
5df2fc06
...
...
@@ -10,7 +10,7 @@ import (
mockrouting
"github.com/ipfs/go-ipfs/routing/mock"
delay
"github.com/ipfs/go-ipfs/thirdparty/delay"
testutil
"github.com/ipfs/go-ipfs/util/testutil"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
testnet/peernet.go
View file @
5df2fc06
...
...
@@ -5,8 +5,8 @@ import (
bsnet
"github.com/ipfs/go-ipfs/exchange/bitswap/network"
mockrouting
"github.com/ipfs/go-ipfs/routing/mock"
testutil
"github.com/ipfs/go-ipfs/util/testutil"
mockpeernet
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/net/mock"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
mockpeernet
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/net/mock"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
testnet/virtual.go
View file @
5df2fc06
...
...
@@ -10,7 +10,7 @@ import (
mockrouting
"github.com/ipfs/go-ipfs/routing/mock"
delay
"github.com/ipfs/go-ipfs/thirdparty/delay"
testutil
"github.com/ipfs/go-ipfs/util/testutil"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
testutils.go
View file @
5df2fc06
...
...
@@ -10,8 +10,8 @@ import (
delay
"github.com/ipfs/go-ipfs/thirdparty/delay"
datastore2
"github.com/ipfs/go-ipfs/util/datastore2"
testutil
"github.com/ipfs/go-ipfs/util/testutil"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
p2ptestutil
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/test/util"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
p2ptestutil
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/test/util"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
wantmanager.go
View file @
5df2fc06
...
...
@@ -9,7 +9,7 @@ import (
bsmsg
"github.com/ipfs/go-ipfs/exchange/bitswap/message"
bsnet
"github.com/ipfs/go-ipfs/exchange/bitswap/network"
wantlist
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
peer
"gx/ipfs/Qm
ZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq
/go-libp2p/p2p/peer"
peer
"gx/ipfs/Qm
QQCBoWhMZtStYuAAo2uDNNLit9n7yX5ANBecfjKq4XBn
/go-libp2p/p2p/peer"
context
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
...
...
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