update libp2p to v3.3.1
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Jun 1, 2016 at 15:51 UTC
7274c6be35561d3c20bf186efadfdff797e50ad6
89 files changed
+386
-349
cmd/ipfs/daemon.go
+4
-4
@@ -24,9 +24,9 @@ import (
24
"github.com/ipfs/go-ipfs/core/corerouting"
25
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
26
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
27
- conn "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/conn"
27
+ conn "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/conn"
28
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
29
util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
29
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
30
prometheus "gx/ipfs/QmdhsRK1EK2fvAz2i2SH5DEfkL6seDuyMYEsxKa9Braim3/client_golang/prometheus"
31
)
32
@@ -247,9 +247,9 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
247
repo.Close() // because ownership hasn't been transferred to the node
248
return
249
}
250
- var infos []peer.PeerInfo
250
+ var infos []pstore.PeerInfo
251
for _, addr := range servers {
252
- infos = append(infos, peer.PeerInfo{
252
+ infos = append(infos, pstore.PeerInfo{
253
ID: addr.ID(),
254
Addrs: []ma.Multiaddr{addr.Transport()},
255
})
cmd/seccat/seccat.go
+5
-4
@@ -18,11 +18,12 @@ import (
18
"os/signal"
19
"syscall"
20
21
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
22
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
23
+ secio "gx/ipfs/QmUmvxT1NTXjk4v9ucPHgC5NHd7s2nHXrVvFbs68NrGuZC/go-libp2p-secio"
24
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
25
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
24
- secio "gx/ipfs/QmbuSYB51KtX8izgab1fSyBgsyMH2hTuCfBtXm77PeXWca/go-libp2p-secio"
25
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
27
)
28
29
var verbose = false
@@ -110,7 +111,7 @@ func main() {
111
}
112
}
113
113
-func setupPeer(a args) (peer.ID, peer.Peerstore, error) {
114
+func setupPeer(a args) (peer.ID, pstore.Peerstore, error) {
115
if a.keybits < 1024 {
116
return "", nil, errors.New("Bitsize less than 1024 is considered unsafe.")
117
}
@@ -126,7 +127,7 @@ func setupPeer(a args) (peer.ID, peer.Peerstore, error) {
127
return "", nil, err
128
}
129
129
- ps := peer.NewPeerstore()
130
+ ps := pstore.NewPeerstore()
131
ps.AddPrivKey(p, sk)
132
ps.AddPubKey(p, pk)
133
core/bootstrap.go
+17
-16
@@ -11,13 +11,14 @@ import (
11
config "github.com/ipfs/go-ipfs/repo/config"
12
lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
13
math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
14
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
15
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
16
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
15
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
16
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
17
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
18
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
19
procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
20
periodicproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
21
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
22
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
)
24
@@ -49,7 +50,7 @@ type BootstrapConfig struct {
50
// BootstrapPeers is a function that returns a set of bootstrap peers
51
// for the bootstrap process to use. This makes it possible for clients
52
// to control the peers the process uses at any moment.
52
- BootstrapPeers func() []peer.PeerInfo
53
+ BootstrapPeers func() []pstore.PeerInfo
54
}
55
56
// DefaultBootstrapConfig specifies default sane parameters for bootstrapping.
@@ -59,9 +60,9 @@ var DefaultBootstrapConfig = BootstrapConfig{
60
ConnectionTimeout: (30 * time.Second) / 3, // Perod / 3
61
}
62
62
-func BootstrapConfigWithPeers(pis []peer.PeerInfo) BootstrapConfig {
63
+func BootstrapConfigWithPeers(pis []pstore.PeerInfo) BootstrapConfig {
64
cfg := DefaultBootstrapConfig
64
- cfg.BootstrapPeers = func() []peer.PeerInfo {
65
+ cfg.BootstrapPeers = func() []pstore.PeerInfo {
66
return pis
67
}
68
return cfg
@@ -128,7 +129,7 @@ func bootstrapRound(ctx context.Context, host host.Host, cfg BootstrapConfig) er
129
numToDial := cfg.MinPeerThreshold - len(connected)
130
131
// filter out bootstrap nodes we are already connected to
131
- var notConnected []peer.PeerInfo
132
+ var notConnected []pstore.PeerInfo
133
for _, p := range peers {
134
if host.Network().Connectedness(p.ID) != inet.Connected {
135
notConnected = append(notConnected, p)
@@ -152,7 +153,7 @@ func bootstrapRound(ctx context.Context, host host.Host, cfg BootstrapConfig) er
153
return nil
154
}
155
155
-func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.PeerInfo) error {
156
+func bootstrapConnect(ctx context.Context, ph host.Host, peers []pstore.PeerInfo) error {
157
if len(peers) < 1 {
158
return ErrNotEnoughBootstrapPeers
159
}
@@ -167,12 +168,12 @@ func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.PeerInfo)
168
// Also, performed asynchronously for dial speed.
169
170
wg.Add(1)
170
- go func(p peer.PeerInfo) {
171
+ go func(p pstore.PeerInfo) {
172
defer wg.Done()
173
defer log.EventBegin(ctx, "bootstrapDial", ph.ID(), p.ID).Done()
174
log.Debugf("%s bootstrapping to %s", ph.ID(), p.ID)
175
175
- ph.Peerstore().AddAddrs(p.ID, p.Addrs, peer.PermanentAddrTTL)
176
+ ph.Peerstore().AddAddrs(p.ID, p.Addrs, pstore.PermanentAddrTTL)
177
if err := ph.Connect(ctx, p); err != nil {
178
log.Event(ctx, "bootstrapDialFailed", p.ID)
179
log.Debugf("failed to bootstrap with %v: %s", p.ID, err)
@@ -201,12 +202,12 @@ func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.PeerInfo)
202
return nil
203
}
204
204
-func toPeerInfos(bpeers []config.BootstrapPeer) []peer.PeerInfo {
205
- pinfos := make(map[peer.ID]*peer.PeerInfo)
205
+func toPeerInfos(bpeers []config.BootstrapPeer) []pstore.PeerInfo {
206
+ pinfos := make(map[peer.ID]*pstore.PeerInfo)
207
for _, bootstrap := range bpeers {
208
pinfo, ok := pinfos[bootstrap.ID()]
209
if !ok {
209
- pinfo = new(peer.PeerInfo)
210
+ pinfo = new(pstore.PeerInfo)
211
pinfos[bootstrap.ID()] = pinfo
212
pinfo.ID = bootstrap.ID()
213
}
@@ -214,7 +215,7 @@ func toPeerInfos(bpeers []config.BootstrapPeer) []peer.PeerInfo {
215
pinfo.Addrs = append(pinfo.Addrs, bootstrap.Transport())
216
}
217
217
- var peers []peer.PeerInfo
218
+ var peers []pstore.PeerInfo
219
for _, pinfo := range pinfos {
220
peers = append(peers, *pinfo)
221
}
@@ -222,9 +223,9 @@ func toPeerInfos(bpeers []config.BootstrapPeer) []peer.PeerInfo {
223
return peers
224
}
225
225
-func randomSubsetOfPeers(in []peer.PeerInfo, max int) []peer.PeerInfo {
226
+func randomSubsetOfPeers(in []pstore.PeerInfo, max int) []pstore.PeerInfo {
227
n := math2.IntMin(max, len(in))
227
- var out []peer.PeerInfo
228
+ var out []pstore.PeerInfo
229
for _, val := range rand.Perm(len(in)) {
230
out = append(out, in[val])
231
if len(out) >= n {
core/bootstrap_test.go
+3
-3
@@ -6,11 +6,11 @@ import (
6
7
config "github.com/ipfs/go-ipfs/repo/config"
8
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
10
)
11
12
func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
13
- var ps []peer.PeerInfo
13
+ var ps []pstore.PeerInfo
14
sizeofSlice := 100
15
for i := 0; i < sizeofSlice; i++ {
16
pid, err := testutil.RandPeerID()
@@ -18,7 +18,7 @@ func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
18
t.Fatal(err)
19
}
20
21
- ps = append(ps, peer.PeerInfo{ID: pid})
21
+ ps = append(ps, pstore.PeerInfo{ID: pid})
22
}
23
out := randomSubsetOfPeers(ps, 2*sizeofSlice)
24
if len(out) != len(ps) {
core/builder.go
+3
-2
@@ -16,10 +16,11 @@ import (
16
pin "github.com/ipfs/go-ipfs/pin"
17
repo "github.com/ipfs/go-ipfs/repo"
18
cfg "github.com/ipfs/go-ipfs/repo/config"
19
+
20
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
21
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
22
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
23
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
24
)
25
26
type BuildCfg struct {
@@ -105,7 +106,7 @@ func NewNode(ctx context.Context, cfg *BuildCfg) (*IpfsNode, error) {
106
mode: offlineMode,
107
Repo: cfg.Repo,
108
ctx: ctx,
108
- Peerstore: peer.NewPeerstore(),
109
+ Peerstore: pstore.NewPeerstore(),
110
}
111
if cfg.Online {
112
n.mode = onlineMode
core/commands/bitswap.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
cmds "github.com/ipfs/go-ipfs/commands"
12
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
15
)
16
17
var BitswapCmd = &cmds.Command{
core/commands/dht.go
+4
-3
@@ -12,8 +12,9 @@ import (
12
notif "github.com/ipfs/go-ipfs/notifications"
13
path "github.com/ipfs/go-ipfs/path"
14
ipdht "github.com/ipfs/go-ipfs/routing/dht"
15
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
16
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
17
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
)
19
20
var ErrNotDHT = errors.New("routing service is not a DHT")
@@ -172,7 +173,7 @@ var findProvidersDhtCmd = &cmds.Command{
173
np := p
174
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
175
Type: notif.Provider,
175
- Responses: []*peer.PeerInfo{&np},
176
+ Responses: []*pstore.PeerInfo{&np},
177
})
178
}
179
}()
@@ -283,7 +284,7 @@ var findPeerDhtCmd = &cmds.Command{
284
285
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
286
Type: notif.FinalPeer,
286
- Responses: []*peer.PeerInfo{&pi},
287
+ Responses: []*pstore.PeerInfo{&pi},
288
})
289
}()
290
},
core/commands/id.go
+5
-3
@@ -13,10 +13,12 @@ import (
13
cmds "github.com/ipfs/go-ipfs/commands"
14
core "github.com/ipfs/go-ipfs/core"
15
kb "github.com/ipfs/go-ipfs/routing/kbucket"
16
- identify "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol/identify"
16
+
17
+ "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
18
+ identify "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol/identify"
19
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
20
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
21
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
22
)
23
24
const offlineIdErrorMessage = `'ipfs id' currently cannot query information on remote
@@ -147,7 +149,7 @@ EXAMPLE:
149
Type: IdOutput{},
150
}
151
150
-func printPeer(ps peer.Peerstore, p peer.ID) (interface{}, error) {
152
+func printPeer(ps pstore.Peerstore, p peer.ID) (interface{}, error) {
153
if p == "" {
154
return nil, errors.New("Attempted to print nil peer!")
155
}
core/commands/ping.go
+4
-3
@@ -10,8 +10,9 @@ import (
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
core "github.com/ipfs/go-ipfs/core"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
15
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
17
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
@@ -94,7 +95,7 @@ trip latency information.
95
}
96
97
if addr != nil {
97
- n.Peerstore.AddAddr(peerID, addr, peer.TempAddrTTL) // temporary
98
+ n.Peerstore.AddAddr(peerID, addr, pstore.TempAddrTTL) // temporary
99
}
100
101
numPings, _, err := req.Option("count").Int()
@@ -127,7 +128,7 @@ func pingPeer(ctx context.Context, n *core.IpfsNode, pid peer.ID, numPings int)
128
outChan <- &PingResult{Text: fmt.Sprintf("Peer lookup error: %s", err)}
129
return
130
}
130
- n.Peerstore.AddAddrs(p.ID, p.Addrs, peer.TempAddrTTL)
131
+ n.Peerstore.AddAddrs(p.ID, p.Addrs, pstore.TempAddrTTL)
132
}
133
134
outChan <- &PingResult{Text: fmt.Sprintf("PING %s.", pid.Pretty())}
core/commands/stat.go
+7
-7
@@ -10,20 +10,20 @@ import (
10
humanize "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
11
12
cmds "github.com/ipfs/go-ipfs/commands"
13
- metrics "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/metrics"
14
- protocol "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ metrics "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/metrics"
15
+ protocol "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol"
16
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
17
)
18
19
var StatsCmd = &cmds.Command{
20
Helptext: cmds.HelpText{
21
- Tagline: "Query ipfs statistics.",
22
- Synopsis: "ipfs stats <command>",
21
+ Tagline: "Query ipfs statistics.",
22
+ Synopsis: "ipfs stats <command>",
23
ShortDescription: `'ipfs stats' is a set of commands to help look at statistics
24
for your ipfs node.
25
`,
26
- LongDescription: `'ipfs stats' is a set of commands to help look at statistics
26
+ LongDescription: `'ipfs stats' is a set of commands to help look at statistics
27
for your ipfs node.`,
28
},
29
@@ -34,7 +34,7 @@ for your ipfs node.`,
34
35
var statBwCmd = &cmds.Command{
36
Helptext: cmds.HelpText{
37
- Tagline: "Print ipfs bandwidth information.",
37
+ Tagline: "Print ipfs bandwidth information.",
38
Synopsis: `ipfs stats bw [--peer <peerId> | -p] [--proto <protocol> | -t] [--poll]
39
[--interval <timeInterval> | -i]
40
`,
core/commands/swarm.go
+4
-4
@@ -10,8 +10,8 @@ import (
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
13
- swarm "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/swarm"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
13
+ swarm "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/swarm"
14
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
15
16
mafilter "gx/ipfs/QmUaRHbB7pUwj5mS9BS4CMvBiW48MpaH2wbGxeWfFhhHxK/multiaddr-filter"
17
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
@@ -355,14 +355,14 @@ func parseAddresses(addrs []string) (iaddrs []iaddr.IPFSAddr, err error) {
355
356
// peersWithAddresses is a function that takes in a slice of string peer addresses
357
// (multiaddr + peerid) and returns a slice of properly constructed peers
358
-func peersWithAddresses(addrs []string) (pis []peer.PeerInfo, err error) {
358
+func peersWithAddresses(addrs []string) (pis []pstore.PeerInfo, err error) {
359
iaddrs, err := parseAddresses(addrs)
360
if err != nil {
361
return nil, err
362
}
363
364
for _, iaddr := range iaddrs {
365
- pis = append(pis, peer.PeerInfo{
365
+ pis = append(pis, pstore.PeerInfo{
366
ID: iaddr.ID(),
367
Addrs: []ma.Multiaddr{iaddr.Transport()},
368
})
core/core.go
+16
-15
@@ -18,22 +18,23 @@ import (
18
19
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
20
diag "github.com/ipfs/go-ipfs/diagnostics"
21
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
22
+ discovery "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/discovery"
23
+ p2phost "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
24
+ p2pbhost "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host/basic"
25
+ rhost "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host/routed"
26
+ metrics "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/metrics"
27
+ swarm "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/swarm"
28
+ addrutil "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/swarm/addr"
29
+ ping "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol/ping"
30
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
22
- discovery "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/discovery"
23
- p2phost "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
24
- p2pbhost "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host/basic"
25
- rhost "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host/routed"
26
- metrics "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/metrics"
27
- swarm "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/swarm"
28
- addrutil "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/swarm/addr"
29
- ping "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol/ping"
31
b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
32
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
33
mamask "gx/ipfs/QmUaRHbB7pUwj5mS9BS4CMvBiW48MpaH2wbGxeWfFhhHxK/multiaddr-filter"
34
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
35
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
36
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
37
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
36
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
38
39
routing "github.com/ipfs/go-ipfs/routing"
40
dht "github.com/ipfs/go-ipfs/routing/dht"
@@ -91,7 +92,7 @@ type IpfsNode struct {
92
PrivateKey ic.PrivKey // the local node's private Key
93
94
// Services
94
- Peerstore peer.Peerstore // storage for other Peer instances
95
+ Peerstore pstore.Peerstore // storage for other Peer instances
96
Blockstore bstore.GCBlockstore // the block store (lower level)
97
Blocks *bserv.BlockService // the block service, get/add blocks.
98
DAG merkledag.DAGService // the merkle dag service, get/add objects.
@@ -196,7 +197,7 @@ func setupDiscoveryOption(d config.Discovery) DiscoveryOption {
197
return nil
198
}
199
199
-func (n *IpfsNode) HandlePeerFound(p peer.PeerInfo) {
200
+func (n *IpfsNode) HandlePeerFound(p pstore.PeerInfo) {
201
log.Warning("trying peer info: ", p)
202
ctx, cancel := context.WithTimeout(n.Context(), discoveryConnTimeout)
203
defer cancel()
@@ -396,7 +397,7 @@ func (n *IpfsNode) Bootstrap(cfg BootstrapConfig) error {
397
// if the caller did not specify a bootstrap peer function, get the
398
// freshest bootstrap peers from config. this responds to live changes.
399
if cfg.BootstrapPeers == nil {
399
- cfg.BootstrapPeers = func() []peer.PeerInfo {
400
+ cfg.BootstrapPeers = func() []pstore.PeerInfo {
401
ps, err := n.loadBootstrapPeers()
402
if err != nil {
403
log.Warning("failed to parse bootstrap peers from config")
@@ -458,7 +459,7 @@ func (n *IpfsNode) LoadPrivateKey() error {
459
return nil
460
}
461
461
-func (n *IpfsNode) loadBootstrapPeers() ([]peer.PeerInfo, error) {
462
+func (n *IpfsNode) loadBootstrapPeers() ([]pstore.PeerInfo, error) {
463
cfg, err := n.Repo.Config()
464
if err != nil {
465
return nil, err
@@ -562,12 +563,12 @@ func listenAddresses(cfg *config.Config) ([]ma.Multiaddr, error) {
563
return listen, nil
564
}
565
565
-type HostOption func(ctx context.Context, id peer.ID, ps peer.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (p2phost.Host, error)
566
+type HostOption func(ctx context.Context, id peer.ID, ps pstore.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (p2phost.Host, error)
567
568
var DefaultHostOption HostOption = constructPeerHost
569
570
// isolates the complex initialization steps
570
-func constructPeerHost(ctx context.Context, id peer.ID, ps peer.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (p2phost.Host, error) {
571
+func constructPeerHost(ctx context.Context, id peer.ID, ps pstore.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (p2phost.Host, error) {
572
573
// no addresses to begin with. we'll start later.
574
network, err := swarm.NewNetwork(ctx, nil, id, ps, bwr)
core/corehttp/gateway.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
9
core "github.com/ipfs/go-ipfs/core"
10
config "github.com/ipfs/go-ipfs/repo/config"
11
- id "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol/identify"
11
+ id "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol/identify"
12
)
13
14
// Gateway should be instantiated using NewGateway
core/corehttp/gateway_test.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
repo "github.com/ipfs/go-ipfs/repo"
17
config "github.com/ipfs/go-ipfs/repo/config"
18
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
19
- id "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol/identify"
19
+ id "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol/identify"
20
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
21
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
)
core/corehttp/metrics_test.go
+3
-3
@@ -5,9 +5,9 @@ import (
5
"time"
6
7
core "github.com/ipfs/go-ipfs/core"
8
- bhost "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host/basic"
9
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
10
- testutil "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/test/util"
8
+ bhost "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host/basic"
9
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
10
+ testutil "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/test/util"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
)
13
core/corenet/net.go
+5
-4
@@ -4,10 +4,11 @@ import (
4
"time"
5
6
core "github.com/ipfs/go-ipfs/core"
7
- net "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
8
- pro "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
+ net "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
9
+ pro "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol"
10
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
12
)
13
14
type ipfsListener struct {
@@ -56,7 +57,7 @@ func Listen(nd *core.IpfsNode, protocol string) (*ipfsListener, error) {
57
func Dial(nd *core.IpfsNode, p peer.ID, protocol string) (net.Stream, error) {
58
ctx, cancel := context.WithTimeout(nd.Context(), time.Second*30)
59
defer cancel()
59
- err := nd.PeerHost.Connect(ctx, peer.PeerInfo{ID: p})
60
+ err := nd.PeerHost.Connect(ctx, pstore.PeerInfo{ID: p})
61
if err != nil {
62
return nil, err
63
}
core/corerouting/core.go
+3
-3
@@ -9,9 +9,9 @@ import (
9
routing "github.com/ipfs/go-ipfs/routing"
10
supernode "github.com/ipfs/go-ipfs/routing/supernode"
11
gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
12
- "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
12
+ "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
13
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
15
)
16
17
// NB: DHT option is included in the core to avoid 1) because it's a sane
@@ -44,7 +44,7 @@ func SupernodeServer(recordSource ds.Datastore) core.RoutingOption {
44
}
45
46
// TODO doc
47
-func SupernodeClient(remotes ...peer.PeerInfo) core.RoutingOption {
47
+func SupernodeClient(remotes ...pstore.PeerInfo) core.RoutingOption {
48
return func(ctx context.Context, ph host.Host, dstore repo.Datastore) (routing.IpfsRouting, error) {
49
if len(remotes) < 1 {
50
return nil, errServersMissing
core/mock/mock.go
+6
-5
@@ -13,10 +13,11 @@ import (
13
config "github.com/ipfs/go-ipfs/repo/config"
14
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
15
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
16
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
17
- metrics "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/metrics"
18
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
19
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
17
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
18
+ metrics "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/metrics"
19
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
20
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
21
)
22
23
// NewMockNode constructs an IpfsNode for use in tests.
@@ -31,7 +32,7 @@ func NewMockNode() (*core.IpfsNode, error) {
32
}
33
34
func MockHostOption(mn mocknet.Mocknet) core.HostOption {
34
- return func(ctx context.Context, id peer.ID, ps peer.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (host.Host, error) {
35
+ return func(ctx context.Context, id peer.ID, ps pstore.Peerstore, bwr metrics.Reporter, fs []*net.IPNet) (host.Host, error) {
36
return mn.AddPeerWithPeerstore(id, ps)
37
}
38
}
diagnostics/diag.go
+4
-4
@@ -12,15 +12,15 @@ import (
12
"time"
13
14
pb "github.com/ipfs/go-ipfs/diagnostics/pb"
15
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
16
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
17
- protocol "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol"
15
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
16
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
17
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
18
+ protocol "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol"
19
ctxio "gx/ipfs/QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa/go-context/io"
20
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
21
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
22
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
23
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
24
)
25
26
var log = logging.Logger("diagnostics")
diagnostics/vis.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"io"
7
8
rtable "github.com/ipfs/go-ipfs/routing/kbucket"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
)
11
12
type node struct {
exchange/bitswap/bitswap.go
+1
-1
@@ -8,11 +8,11 @@ import (
8
"sync"
9
"time"
10
11
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
12
process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
13
procctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
15
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
17
blocks "github.com/ipfs/go-ipfs/blocks"
18
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
exchange/bitswap/bitswap_test.go
+1
-1
@@ -17,7 +17,7 @@ import (
17
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
18
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
19
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
20
- p2ptestutil "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/test/util"
20
+ p2ptestutil "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/test/util"
21
)
22
23
// FIXME the tests are really sensitive to the network delay. fix them to work
exchange/bitswap/decision/bench_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
10
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
10
+ "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
)
12
13
// FWIW: At the time of this commit, including a timestamp in task increases
exchange/bitswap/decision/engine.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
9
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
10
wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
11
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
12
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
)
15
16
// TODO consider taking responsibility for other types of requests. For
exchange/bitswap/decision/engine_test.go
+1
-1
@@ -14,8 +14,8 @@ import (
14
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
15
message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
16
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
19
)
20
21
type peerAndEngine struct {
exchange/bitswap/decision/ledger.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
8
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
8
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
9
)
10
11
// keySet is just a convenient alias for maps of keys, where we only care
exchange/bitswap/decision/peer_request_queue.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9
pq "github.com/ipfs/go-ipfs/thirdparty/pq"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
)
12
13
type peerRequestQueue interface {
exchange/bitswap/message/message.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
pb "github.com/ipfs/go-ipfs/exchange/bitswap/message/pb"
9
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
10
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
10
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
11
12
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
exchange/bitswap/network/interface.go
+2
-2
@@ -3,9 +3,9 @@ package network
3
import (
4
key "github.com/ipfs/go-ipfs/blocks/key"
5
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
6
- protocol "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol"
6
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
7
+ protocol "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol"
8
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
)
10
11
var ProtocolBitswap protocol.ID = "/ipfs/bitswap"
exchange/bitswap/network/ipfs_impl.go
+8
-6
@@ -6,13 +6,15 @@ import (
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
8
routing "github.com/ipfs/go-ipfs/routing"
9
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
10
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
9
+
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
12
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
13
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
14
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
15
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
15
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
)
19
20
var log = logging.Logger("bitswap_network")
@@ -45,7 +47,7 @@ func (bsnet *impl) newStreamToPeer(ctx context.Context, p peer.ID) (inet.Stream,
47
// first, make sure we're connected.
48
// if this fails, we cannot connect to given peer.
49
//TODO(jbenet) move this into host.NewStream?
48
- if err := bsnet.host.Connect(ctx, peer.PeerInfo{ID: p}); err != nil {
50
+ if err := bsnet.host.Connect(ctx, pstore.PeerInfo{ID: p}); err != nil {
51
return nil, err
52
}
53
@@ -101,7 +103,7 @@ func (bsnet *impl) SetDelegate(r Receiver) {
103
}
104
105
func (bsnet *impl) ConnectTo(ctx context.Context, p peer.ID) error {
104
- return bsnet.host.Connect(ctx, peer.PeerInfo{ID: p})
106
+ return bsnet.host.Connect(ctx, pstore.PeerInfo{ID: p})
107
}
108
109
// FindProvidersAsync returns a channel of providers for the given key
@@ -129,7 +131,7 @@ func (bsnet *impl) FindProvidersAsync(ctx context.Context, k key.Key, max int) <
131
if info.ID == bsnet.host.ID() {
132
continue // ignore self as provider
133
}
132
- bsnet.host.Peerstore().AddAddrs(info.ID, info.Addrs, peer.TempAddrTTL)
134
+ bsnet.host.Peerstore().AddAddrs(info.ID, info.Addrs, pstore.TempAddrTTL)
135
select {
136
case <-ctx.Done():
137
return
exchange/bitswap/testnet/interface.go
+1
-1
@@ -3,7 +3,7 @@ package bitswap
3
import (
4
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
5
"github.com/ipfs/go-ipfs/thirdparty/testutil"
6
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
6
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
7
)
8
9
type Network interface {
exchange/bitswap/testnet/network_test.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
15
)
16
17
func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
exchange/bitswap/testnet/peernet.go
+2
-2
@@ -5,9 +5,9 @@ import (
5
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
6
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
7
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
8
- mockpeernet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
8
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
9
+ mockpeernet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
10
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
11
)
12
13
type peernet struct {
exchange/bitswap/testnet/virtual.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
15
)
16
17
func VirtualNetwork(rs mockrouting.Server, d delay.D) Network {
exchange/bitswap/testutils.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
- p2ptestutil "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/test/util"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ p2ptestutil "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/test/util"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
)
17
18
// WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!
exchange/bitswap/wantmanager.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
bsmsg "github.com/ipfs/go-ipfs/exchange/bitswap/message"
10
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
11
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
13
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
)
15
16
type WantManager struct {
exchange/bitswap/workers.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
11
key "github.com/ipfs/go-ipfs/blocks/key"
12
wantlist "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
15
)
16
17
var TaskWorkerCount = 8
namesys/publisher.go
+1
-1
@@ -19,9 +19,9 @@ import (
19
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
20
record "github.com/ipfs/go-ipfs/routing/record"
21
ft "github.com/ipfs/go-ipfs/unixfs"
22
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
23
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
24
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
24
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
25
)
26
27
// ErrExpiredRecord should be returned when an ipns record is
namesys/republisher/repub.go
+4
-3
@@ -11,12 +11,13 @@ import (
11
path "github.com/ipfs/go-ipfs/path"
12
"github.com/ipfs/go-ipfs/routing"
13
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
15
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
16
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
17
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
18
gpctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
19
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
20
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
21
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
23
)
@@ -32,7 +33,7 @@ const DefaultRecordLifetime = time.Hour * 24
33
type Republisher struct {
34
r routing.IpfsRouting
35
ds ds.Datastore
35
- ps peer.Peerstore
36
+ ps pstore.Peerstore
37
38
Interval time.Duration
39
@@ -43,7 +44,7 @@ type Republisher struct {
44
entries map[peer.ID]struct{}
45
}
46
46
-func NewRepublisher(r routing.IpfsRouting, ds ds.Datastore, ps peer.Peerstore) *Republisher {
47
+func NewRepublisher(r routing.IpfsRouting, ds ds.Datastore, ps pstore.Peerstore) *Republisher {
48
return &Republisher{
49
r: r,
50
ps: ps,
namesys/republisher/repub_test.go
+3
-3
@@ -13,8 +13,8 @@ import (
13
namesys "github.com/ipfs/go-ipfs/namesys"
14
. "github.com/ipfs/go-ipfs/namesys/republisher"
15
path "github.com/ipfs/go-ipfs/path"
16
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
17
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
17
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
18
)
19
20
func TestRepublish(t *testing.T) {
@@ -44,7 +44,7 @@ func TestRepublish(t *testing.T) {
44
mn.LinkAll()
45
46
bsinf := core.BootstrapConfigWithPeers(
47
- []peer.PeerInfo{
47
+ []pstore.PeerInfo{
48
nodes[0].Peerstore.PeerInfo(nodes[0].Identity),
49
},
50
)
namesys/resolve_test.go
+1
-1
@@ -11,9 +11,9 @@ import (
11
path "github.com/ipfs/go-ipfs/path"
12
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
13
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
15
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
17
)
18
19
func TestRoutingResolve(t *testing.T) {
notifications/query.go
+4
-3
@@ -3,8 +3,9 @@ package notifications
3
import (
4
"encoding/json"
5
6
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
7
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
8
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
)
10
11
const RoutingQueryKey = "RoutingQueryEvent"
@@ -25,7 +26,7 @@ const (
26
type QueryEvent struct {
27
ID peer.ID
28
Type QueryEventType
28
- Responses []*peer.PeerInfo
29
+ Responses []*pstore.PeerInfo
30
Extra string
31
}
32
@@ -63,7 +64,7 @@ func (qe *QueryEvent) UnmarshalJSON(b []byte) error {
64
temp := struct {
65
ID string
66
Type int
66
- Responses []*peer.PeerInfo
67
+ Responses []*pstore.PeerInfo
68
Extra string
69
}{}
70
err := json.Unmarshal(b, &temp)
package.json
+7
-7
@@ -13,15 +13,15 @@
13
"version": "1.1.0"
14
},
15
{
16
- "hash": "QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq",
16
+ "hash": "QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki",
17
"name": "go-libp2p",
18
- "version": "3.2.3"
18
+ "version": "3.3.1"
19
},
20
{
21
"author": "whyrusleeping",
22
- "hash": "QmbuSYB51KtX8izgab1fSyBgsyMH2hTuCfBtXm77PeXWca",
22
+ "hash": "QmUmvxT1NTXjk4v9ucPHgC5NHd7s2nHXrVvFbs68NrGuZC",
23
"name": "go-libp2p-secio",
24
- "version": "1.0.4"
24
+ "version": "1.0.6"
25
},
26
{
27
"author": "whyrusleeping",
@@ -31,9 +31,9 @@
31
},
32
{
33
"author": "whyrusleeping",
34
- "hash": "QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4",
34
+ "hash": "QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC",
35
"name": "go-libp2p-peer",
36
- "version": "1.0.6"
36
+ "version": "2.0.0"
37
},
38
{
39
"hash": "QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt",
@@ -118,4 +118,4 @@
118
"license": "MIT",
119
"name": "go-ipfs",
120
"version": "0.4.0"
121
-}
\ No newline at end of file
121
+}
pin/pin.go
+9
-9
@@ -45,11 +45,11 @@ const (
45
func PinModeToString(mode PinMode) (string, bool) {
46
m := map[PinMode]string{
47
Recursive: linkRecursive,
48
- Direct: linkDirect,
49
- Indirect: linkIndirect,
50
- Internal: linkInternal,
48
+ Direct: linkDirect,
49
+ Indirect: linkIndirect,
50
+ Internal: linkInternal,
51
NotPinned: linkNotPinned,
52
- Any: linkAny,
52
+ Any: linkAny,
53
}
54
s, ok := m[mode]
55
return s, ok
@@ -58,12 +58,12 @@ func PinModeToString(mode PinMode) (string, bool) {
58
func StringToPinMode(s string) (PinMode, bool) {
59
m := map[string]PinMode{
60
linkRecursive: Recursive,
61
- linkDirect: Direct,
62
- linkIndirect: Indirect,
63
- linkInternal: Internal,
61
+ linkDirect: Direct,
62
+ linkIndirect: Indirect,
63
+ linkInternal: Internal,
64
linkNotPinned: NotPinned,
65
- linkAny: Any,
66
- linkAll: Any, // "all" and "any" means the same thing
65
+ linkAny: Any,
66
+ linkAll: Any, // "all" and "any" means the same thing
67
}
68
mode, ok := m[s]
69
return mode, ok
repo/config/init.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
"fmt"
7
"io"
8
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
11
)
12
13
func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
routing/dht/dht.go
+14
-13
@@ -14,17 +14,18 @@ import (
14
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
15
kb "github.com/ipfs/go-ipfs/routing/kbucket"
16
record "github.com/ipfs/go-ipfs/routing/record"
17
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
18
- protocol "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/protocol"
19
- ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
20
- logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
21
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
17
18
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
19
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
20
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
21
+ protocol "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/protocol"
22
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
23
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
24
+ ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
25
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
26
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
27
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
28
+ logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
29
)
30
31
var log = logging.Logger("dht")
@@ -40,9 +41,9 @@ const NumBootstrapQueries = 5
41
// IpfsDHT is an implementation of Kademlia with Coral and S/Kademlia modifications.
42
// It is used to implement the base IpfsRouting module.
43
type IpfsDHT struct {
43
- host host.Host // the network services we need
44
- self peer.ID // Local peer (yourself)
45
- peerstore peer.Peerstore // Peer Registry
44
+ host host.Host // the network services we need
45
+ self peer.ID // Local peer (yourself)
46
+ peerstore pstore.Peerstore // Peer Registry
47
48
datastore ds.Datastore // Local data
49
@@ -127,7 +128,7 @@ func (dht *IpfsDHT) putValueToPeer(ctx context.Context, p peer.ID,
128
func (dht *IpfsDHT) putProvider(ctx context.Context, p peer.ID, skey string) error {
129
130
// add self as the provider
130
- pi := peer.PeerInfo{
131
+ pi := pstore.PeerInfo{
132
ID: dht.self,
133
Addrs: dht.host.Addrs(),
134
}
@@ -140,7 +141,7 @@ func (dht *IpfsDHT) putProvider(ctx context.Context, p peer.ID, skey string) err
141
}
142
143
pmes := pb.NewMessage(pb.Message_ADD_PROVIDER, skey, 0)
143
- pmes.ProviderPeers = pb.RawPeerInfosToPBPeers([]peer.PeerInfo{pi})
144
+ pmes.ProviderPeers = pb.RawPeerInfosToPBPeers([]pstore.PeerInfo{pi})
145
err := dht.sendMessage(ctx, p, pmes)
146
if err != nil {
147
return err
@@ -157,7 +158,7 @@ var errInvalidRecord = errors.New("received invalid record")
158
// NOTE: It will update the dht's peerstore with any new addresses
159
// it finds for the given peer.
160
func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,
160
- key key.Key) (*pb.Record, []peer.PeerInfo, error) {
161
+ key key.Key) (*pb.Record, []pstore.PeerInfo, error) {
162
163
pmes, err := dht.getValueSingle(ctx, p, key)
164
if err != nil {
@@ -258,12 +259,12 @@ func (dht *IpfsDHT) Update(ctx context.Context, p peer.ID) {
259
}
260
261
// FindLocal looks for a peer with a given ID connected to this dht and returns the peer and the table it was found in.
261
-func (dht *IpfsDHT) FindLocal(id peer.ID) peer.PeerInfo {
262
+func (dht *IpfsDHT) FindLocal(id peer.ID) pstore.PeerInfo {
263
p := dht.routingTable.Find(id)
264
if p != "" {
265
return dht.peerstore.PeerInfo(p)
266
}
266
- return peer.PeerInfo{}
267
+ return pstore.PeerInfo{}
268
}
269
270
// findPeerSingle asks peer 'p' if they know where the peer with id 'id' is
routing/dht/dht_bootstrap.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"time"
10
11
routing "github.com/ipfs/go-ipfs/routing"
12
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
13
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
15
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
16
periodicproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic"
routing/dht/dht_net.go
+2
-2
@@ -5,11 +5,11 @@ import (
5
"time"
6
7
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
8
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
8
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
9
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
10
ctxio "gx/ipfs/QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa/go-context/io"
11
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
12
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
13
)
14
15
// handleNewStream implements the inet.StreamHandler
routing/dht/dht_test.go
+14
-14
@@ -11,18 +11,18 @@ import (
11
12
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
13
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
14
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
15
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
-
14
key "github.com/ipfs/go-ipfs/blocks/key"
15
routing "github.com/ipfs/go-ipfs/routing"
16
record "github.com/ipfs/go-ipfs/routing/record"
20
- netutil "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/test/util"
21
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
23
-
17
ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
18
travisci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
19
+
20
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
21
+ netutil "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/test/util"
22
+ ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
23
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
24
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
25
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26
)
27
28
var testCaseValues = map[key.Key][]byte{}
@@ -73,8 +73,8 @@ func connect(t *testing.T, ctx context.Context, a, b *IpfsDHT) {
73
t.Fatal("peers setup incorrectly: no local address")
74
}
75
76
- a.peerstore.AddAddrs(idB, addrB, peer.TempAddrTTL)
77
- pi := peer.PeerInfo{ID: idB}
76
+ a.peerstore.AddAddrs(idB, addrB, pstore.TempAddrTTL)
77
+ pi := pstore.PeerInfo{ID: idB}
78
if err := a.host.Connect(ctx, pi); err != nil {
79
t.Fatal(err)
80
}
@@ -705,7 +705,7 @@ func TestFindPeersConnectedToPeer(t *testing.T) {
705
}
706
707
// shouldFind := []peer.ID{peers[1], peers[3]}
708
- found := []peer.PeerInfo{}
708
+ var found []pstore.PeerInfo
709
for nextp := range pchan {
710
found = append(found, nextp)
711
}
@@ -776,14 +776,14 @@ func TestConnectCollision(t *testing.T) {
776
777
errs := make(chan error)
778
go func() {
779
- dhtA.peerstore.AddAddr(peerB, addrB, peer.TempAddrTTL)
780
- pi := peer.PeerInfo{ID: peerB}
779
+ dhtA.peerstore.AddAddr(peerB, addrB, pstore.TempAddrTTL)
780
+ pi := pstore.PeerInfo{ID: peerB}
781
err := dhtA.host.Connect(ctx, pi)
782
errs <- err
783
}()
784
go func() {
785
- dhtB.peerstore.AddAddr(peerA, addrA, peer.TempAddrTTL)
786
- pi := peer.PeerInfo{ID: peerA}
785
+ dhtB.peerstore.AddAddr(peerA, addrA, pstore.TempAddrTTL)
786
+ pi := pstore.PeerInfo{ID: peerA}
787
err := dhtB.host.Connect(ctx, pi)
788
errs <- err
789
}()
routing/dht/diag.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"encoding/json"
5
"time"
6
7
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
)
9
10
type connDiagInfo struct {
routing/dht/ext_test.go
+8
-8
@@ -9,17 +9,17 @@ import (
9
10
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
11
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
12
- ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
13
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
-
12
key "github.com/ipfs/go-ipfs/blocks/key"
13
routing "github.com/ipfs/go-ipfs/routing"
14
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
15
record "github.com/ipfs/go-ipfs/routing/record"
19
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
20
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
16
+
17
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
18
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
19
+ ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
20
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
21
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
22
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
)
24
25
func TestGetFailures(t *testing.T) {
@@ -183,7 +183,7 @@ func TestNotFound(t *testing.T) {
183
case pb.Message_GET_VALUE:
184
resp := &pb.Message{Type: pmes.Type}
185
186
- ps := []peer.PeerInfo{}
186
+ ps := []pstore.PeerInfo{}
187
for i := 0; i < 7; i++ {
188
p := hosts[rand.Intn(len(hosts))].ID()
189
pi := host.Peerstore().PeerInfo(p)
@@ -262,7 +262,7 @@ func TestLessThanKResponses(t *testing.T) {
262
pi := host.Peerstore().PeerInfo(hosts[1].ID())
263
resp := &pb.Message{
264
Type: pmes.Type,
265
- CloserPeers: pb.PeerInfosToPBPeers(d.host.Network(), []peer.PeerInfo{pi}),
265
+ CloserPeers: pb.PeerInfosToPBPeers(d.host.Network(), []pstore.PeerInfo{pi}),
266
}
267
268
if err := pbw.WriteMsg(resp); err != nil {
routing/dht/handlers.go
+9
-7
@@ -9,10 +9,12 @@ import (
9
key "github.com/ipfs/go-ipfs/blocks/key"
10
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
11
lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
12
+
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
15
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
16
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
)
19
20
// The number of closer peers to send on requests.
@@ -63,7 +65,7 @@ func (dht *IpfsDHT) handleGetValue(ctx context.Context, p peer.ID, pmes *pb.Mess
65
// Find closest peer on given cluster to desired key and reply with that info
66
closer := dht.betterPeersToQuery(pmes, p, CloserPeerCount)
67
if len(closer) > 0 {
66
- closerinfos := peer.PeerInfos(dht.peerstore, closer)
68
+ closerinfos := pstore.PeerInfos(dht.peerstore, closer)
69
for _, pi := range closerinfos {
70
log.Debugf("handleGetValue returning closer peer: '%s'", pi.ID)
71
if len(pi.Addrs) < 1 {
@@ -190,8 +192,8 @@ func (dht *IpfsDHT) handleFindPeer(ctx context.Context, p peer.ID, pmes *pb.Mess
192
return resp, nil
193
}
194
193
- var withAddresses []peer.PeerInfo
194
- closestinfos := peer.PeerInfos(dht.peerstore, closest)
195
+ var withAddresses []pstore.PeerInfo
196
+ closestinfos := pstore.PeerInfos(dht.peerstore, closest)
197
for _, pi := range closestinfos {
198
if len(pi.Addrs) > 0 {
199
withAddresses = append(withAddresses, pi)
@@ -232,7 +234,7 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.
234
}
235
236
if providers != nil && len(providers) > 0 {
235
- infos := peer.PeerInfos(dht.peerstore, providers)
237
+ infos := pstore.PeerInfos(dht.peerstore, providers)
238
resp.ProviderPeers = pb.PeerInfosToPBPeers(dht.host.Network(), infos)
239
log.Debugf("%s have %d providers: %s", reqDesc, len(providers), infos)
240
}
@@ -240,7 +242,7 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.
242
// Also send closer peers.
243
closer := dht.betterPeersToQuery(pmes, p, CloserPeerCount)
244
if closer != nil {
243
- infos := peer.PeerInfos(dht.peerstore, closer)
245
+ infos := pstore.PeerInfos(dht.peerstore, closer)
246
resp.CloserPeers = pb.PeerInfosToPBPeers(dht.host.Network(), infos)
247
log.Debugf("%s have %d closer peers: %s", reqDesc, len(closer), infos)
248
}
@@ -276,7 +278,7 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.M
278
log.Infof("received provider %s for %s (addrs: %s)", p, key, pi.Addrs)
279
if pi.ID != dht.self { // dont add own addrs.
280
// add the received addresses to our peerstore.
279
- dht.peerstore.AddAddrs(pi.ID, pi.Addrs, peer.ProviderAddrTTL)
281
+ dht.peerstore.AddAddrs(pi.ID, pi.Addrs, pstore.ProviderAddrTTL)
282
}
283
dht.providers.AddProvider(ctx, key, p)
284
}
routing/dht/lookup.go
+7
-5
@@ -5,13 +5,15 @@ import (
5
notif "github.com/ipfs/go-ipfs/notifications"
6
kb "github.com/ipfs/go-ipfs/routing/kbucket"
7
pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
8
+
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
12
)
13
14
// Required in order for proper JSON marshaling
13
-func pointerizePeerInfos(pis []peer.PeerInfo) []*peer.PeerInfo {
14
- out := make([]*peer.PeerInfo, len(pis))
15
+func pointerizePeerInfos(pis []pstore.PeerInfo) []*pstore.PeerInfo {
16
+ out := make([]*pstore.PeerInfo, len(pis))
17
for i, p := range pis {
18
np := p
19
out[i] = &np
@@ -56,7 +58,7 @@ func (dht *IpfsDHT) GetClosestPeers(ctx context.Context, key key.Key) (<-chan pe
58
return nil, err
59
}
60
59
- var filtered []peer.PeerInfo
61
+ var filtered []pstore.PeerInfo
62
for _, clp := range closer {
63
if kb.Closer(clp, dht.self, key) && peerset.TryAdd(clp) {
64
select {
@@ -101,7 +103,7 @@ func (dht *IpfsDHT) closerPeersSingle(ctx context.Context, key key.Key, p peer.I
103
for _, pbp := range pmes.GetCloserPeers() {
104
pid := peer.ID(pbp.GetId())
105
if pid != dht.self { // dont add self
104
- dht.peerstore.AddAddrs(pid, pbp.Addresses(), peer.TempAddrTTL)
106
+ dht.peerstore.AddAddrs(pid, pbp.Addresses(), pstore.TempAddrTTL)
107
out = append(out, pid)
108
}
109
}
routing/dht/notif.go
+1
-1
@@ -3,7 +3,7 @@ package dht
3
import (
4
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
5
6
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
6
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
7
)
8
9
// netNotifiee defines methods to be used with the IpfsDHT
routing/dht/pb/message.go
+13
-12
@@ -4,15 +4,16 @@ import (
4
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
5
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
9
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
10
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
11
)
12
13
var log = logging.Logger("dht.pb")
14
15
type PeerRoutingInfo struct {
15
- peer.PeerInfo
16
+ pstore.PeerInfo
17
inet.Connectedness
18
}
19
@@ -40,7 +41,7 @@ func peerRoutingInfoToPBPeer(p PeerRoutingInfo) *Message_Peer {
41
return pbp
42
}
43
43
-func peerInfoToPBPeer(p peer.PeerInfo) *Message_Peer {
44
+func peerInfoToPBPeer(p pstore.PeerInfo) *Message_Peer {
45
pbp := new(Message_Peer)
46
47
pbp.Addrs = make([][]byte, len(p.Addrs))
@@ -52,9 +53,9 @@ func peerInfoToPBPeer(p peer.PeerInfo) *Message_Peer {
53
return pbp
54
}
55
55
-// PBPeerToPeer turns a *Message_Peer into its peer.PeerInfo counterpart
56
-func PBPeerToPeerInfo(pbp *Message_Peer) peer.PeerInfo {
57
- return peer.PeerInfo{
56
+// PBPeerToPeer turns a *Message_Peer into its pstore.PeerInfo counterpart
57
+func PBPeerToPeerInfo(pbp *Message_Peer) pstore.PeerInfo {
58
+ return pstore.PeerInfo{
59
ID: peer.ID(pbp.GetId()),
60
Addrs: pbp.Addresses(),
61
}
@@ -62,7 +63,7 @@ func PBPeerToPeerInfo(pbp *Message_Peer) peer.PeerInfo {
63
64
// RawPeerInfosToPBPeers converts a slice of Peers into a slice of *Message_Peers,
65
// ready to go out on the wire.
65
-func RawPeerInfosToPBPeers(peers []peer.PeerInfo) []*Message_Peer {
66
+func RawPeerInfosToPBPeers(peers []pstore.PeerInfo) []*Message_Peer {
67
pbpeers := make([]*Message_Peer, len(peers))
68
for i, p := range peers {
69
pbpeers[i] = peerInfoToPBPeer(p)
@@ -74,7 +75,7 @@ func RawPeerInfosToPBPeers(peers []peer.PeerInfo) []*Message_Peer {
75
// which can be written to a message and sent out. the key thing this function
76
// does (in addition to PeersToPBPeers) is set the ConnectionType with
77
// information from the given inet.Network.
77
-func PeerInfosToPBPeers(n inet.Network, peers []peer.PeerInfo) []*Message_Peer {
78
+func PeerInfosToPBPeers(n inet.Network, peers []pstore.PeerInfo) []*Message_Peer {
79
pbps := RawPeerInfosToPBPeers(peers)
80
for i, pbp := range pbps {
81
c := ConnectionType(n.Connectedness(peers[i].ID))
@@ -91,10 +92,10 @@ func PeerRoutingInfosToPBPeers(peers []PeerRoutingInfo) []*Message_Peer {
92
return pbpeers
93
}
94
94
-// PBPeersToPeerInfos converts given []*Message_Peer into []peer.PeerInfo
95
+// PBPeersToPeerInfos converts given []*Message_Peer into []pstore.PeerInfo
96
// Invalid addresses will be silently omitted.
96
-func PBPeersToPeerInfos(pbps []*Message_Peer) []peer.PeerInfo {
97
- peers := make([]peer.PeerInfo, 0, len(pbps))
97
+func PBPeersToPeerInfos(pbps []*Message_Peer) []pstore.PeerInfo {
98
+ peers := make([]pstore.PeerInfo, 0, len(pbps))
99
for _, pbp := range pbps {
100
peers = append(peers, PBPeerToPeerInfo(pbp))
101
}
routing/dht/providers.go
+1
-1
@@ -4,9 +4,9 @@ import (
4
"time"
5
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
9
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
10
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
)
routing/dht/providers_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
9
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
)
routing/dht/query.go
+11
-10
@@ -8,14 +8,15 @@ import (
8
"github.com/ipfs/go-ipfs/routing"
9
pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
10
todoctr "github.com/ipfs/go-ipfs/thirdparty/todocounter"
11
- u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
12
- logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
- queue "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer/queue"
11
12
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
13
process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
14
ctxproc "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
15
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
16
+ queue "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore/queue"
17
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
20
)
21
22
var maxQueryConcurrency = AlphaValue
@@ -28,10 +29,10 @@ type dhtQuery struct {
29
}
30
31
type dhtQueryResult struct {
31
- value []byte // GetValue
32
- peer peer.PeerInfo // FindPeer
33
- providerPeers []peer.PeerInfo // GetProviders
34
- closerPeers []peer.PeerInfo // *
32
+ value []byte // GetValue
33
+ peer pstore.PeerInfo // FindPeer
34
+ providerPeers []pstore.PeerInfo // GetProviders
35
+ closerPeers []pstore.PeerInfo // *
36
success bool
37
}
38
@@ -239,7 +240,7 @@ func (r *dhtQueryRunner) queryPeer(proc process.Process, p peer.ID) {
240
// forward progress during potentially very high latency dials.
241
r.rateLimit <- struct{}{}
242
242
- pi := peer.PeerInfo{ID: p}
243
+ pi := pstore.PeerInfo{ID: p}
244
245
if err := r.query.dht.host.Connect(ctx, pi); err != nil {
246
log.Debugf("Error connecting: %s", err)
@@ -286,7 +287,7 @@ func (r *dhtQueryRunner) queryPeer(proc process.Process, p peer.ID) {
287
}
288
289
// add their addresses to the dialer's peerstore
289
- r.query.dht.peerstore.AddAddrs(next.ID, next.Addrs, peer.TempAddrTTL)
290
+ r.query.dht.peerstore.AddAddrs(next.ID, next.Addrs, pstore.TempAddrTTL)
291
r.addPeerToQuery(next.ID)
292
log.Debugf("PEERS CLOSER -- worker for: %v added %v (%v)", p, next.ID, next.Addrs)
293
}
routing/dht/records.go
+1
-1
@@ -7,10 +7,10 @@ import (
7
routing "github.com/ipfs/go-ipfs/routing"
8
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
9
record "github.com/ipfs/go-ipfs/routing/record"
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
12
ctxfrac "gx/ipfs/QmX6DhWrpBB5NtadXmPSXYNdVvuLfJXoFNMvUMoVvP5UJa/go-context/frac"
13
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
)
15
16
// MaxRecordAge specifies the maximum time that any node will hold onto a record
routing/dht/routing.go
+17
-15
@@ -12,9 +12,11 @@ import (
12
kb "github.com/ipfs/go-ipfs/routing/kbucket"
13
record "github.com/ipfs/go-ipfs/routing/record"
14
pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
15
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
15
+
16
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
17
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
18
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
19
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
20
)
21
22
// asyncQueryBuffer is the size of buffered channels in async queries. This
@@ -258,8 +260,8 @@ func (dht *IpfsDHT) Provide(ctx context.Context, key key.Key) error {
260
}
261
262
// FindProviders searches until the context expires.
261
-func (dht *IpfsDHT) FindProviders(ctx context.Context, key key.Key) ([]peer.PeerInfo, error) {
262
- var providers []peer.PeerInfo
263
+func (dht *IpfsDHT) FindProviders(ctx context.Context, key key.Key) ([]pstore.PeerInfo, error) {
264
+ var providers []pstore.PeerInfo
265
for p := range dht.FindProvidersAsync(ctx, key, KValue) {
266
providers = append(providers, p)
267
}
@@ -269,14 +271,14 @@ func (dht *IpfsDHT) FindProviders(ctx context.Context, key key.Key) ([]peer.Peer
271
// FindProvidersAsync is the same thing as FindProviders, but returns a channel.
272
// Peers will be returned on the channel as soon as they are found, even before
273
// the search query completes.
272
-func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key key.Key, count int) <-chan peer.PeerInfo {
274
+func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key key.Key, count int) <-chan pstore.PeerInfo {
275
log.Event(ctx, "findProviders", &key)
274
- peerOut := make(chan peer.PeerInfo, count)
276
+ peerOut := make(chan pstore.PeerInfo, count)
277
go dht.findProvidersAsyncRoutine(ctx, key, count, peerOut)
278
return peerOut
279
}
280
279
-func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key key.Key, count int, peerOut chan peer.PeerInfo) {
281
+func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key key.Key, count int, peerOut chan pstore.PeerInfo) {
282
defer log.EventBegin(ctx, "findProvidersAsync", &key).Done()
283
defer close(peerOut)
284
@@ -357,7 +359,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key key.Key,
359
}
360
361
// FindPeer searches for a peer with given ID.
360
-func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, error) {
362
+func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (pstore.PeerInfo, error) {
363
defer log.EventBegin(ctx, "FindPeer", id).Done()
364
365
// Check if were already connected to them
@@ -367,7 +369,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
369
370
peers := dht.routingTable.NearestPeers(kb.ConvertPeerID(id), KValue)
371
if len(peers) == 0 {
370
- return peer.PeerInfo{}, kb.ErrLookupFailure
372
+ return pstore.PeerInfo{}, kb.ErrLookupFailure
373
}
374
375
// Sanity...
@@ -415,22 +417,22 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
417
// run it!
418
result, err := query.Run(ctx, peers)
419
if err != nil {
418
- return peer.PeerInfo{}, err
420
+ return pstore.PeerInfo{}, err
421
}
422
423
log.Debugf("FindPeer %v %v", id, result.success)
424
if result.peer.ID == "" {
423
- return peer.PeerInfo{}, routing.ErrNotFound
425
+ return pstore.PeerInfo{}, routing.ErrNotFound
426
}
427
428
return result.peer, nil
429
}
430
431
// FindPeersConnectedToPeer searches for peers directly connected to a given peer.
430
-func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<-chan peer.PeerInfo, error) {
432
+func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<-chan pstore.PeerInfo, error) {
433
432
- peerchan := make(chan peer.PeerInfo, asyncQueryBuffer)
433
- peersSeen := peer.Set{}
434
+ peerchan := make(chan pstore.PeerInfo, asyncQueryBuffer)
435
+ peersSeen := make(map[peer.ID]struct{})
436
437
peers := dht.routingTable.NearestPeers(kb.ConvertPeerID(id), KValue)
438
if len(peers) == 0 {
@@ -445,7 +447,7 @@ func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<
447
return nil, err
448
}
449
448
- var clpeers []peer.PeerInfo
450
+ var clpeers []pstore.PeerInfo
451
closer := pmes.GetCloserPeers()
452
for _, pbp := range closer {
453
pi := pb.PBPeerToPeerInfo(pbp)
routing/kbucket/bucket.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"container/list"
5
"sync"
6
7
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
)
9
10
// Bucket holds a list of peers.
routing/kbucket/sorting.go
+1
-1
@@ -2,7 +2,7 @@ package kbucket
2
3
import (
4
"container/list"
5
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
5
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
6
"sort"
7
)
8
routing/kbucket/table.go
+4
-3
@@ -7,8 +7,9 @@ import (
7
"sync"
8
"time"
9
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
12
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
11
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
13
)
14
15
var log = logging.Logger("table")
@@ -23,7 +24,7 @@ type RoutingTable struct {
24
tabLock sync.RWMutex
25
26
// latency metrics
26
- metrics peer.Metrics
27
+ metrics pstore.Metrics
28
29
// Maximum acceptable latency for peers in this cluster
30
maxLatency time.Duration
@@ -34,7 +35,7 @@ type RoutingTable struct {
35
}
36
37
// NewRoutingTable creates a new routing table with a given bucketsize, local ID, and latency tolerance.
37
-func NewRoutingTable(bucketsize int, localID ID, latency time.Duration, m peer.Metrics) *RoutingTable {
38
+func NewRoutingTable(bucketsize int, localID ID, latency time.Duration, m pstore.Metrics) *RoutingTable {
39
rt := new(RoutingTable)
40
rt.Buckets = []*Bucket{newBucket()}
41
rt.bucketsize = bucketsize
routing/kbucket/table_test.go
+8
-7
@@ -7,7 +7,8 @@ import (
7
8
tu "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
12
)
13
14
// Test basic features of the bucket struct
@@ -51,7 +52,7 @@ func TestBucket(t *testing.T) {
52
// Right now, this just makes sure that it doesnt hang or crash
53
func TestTableUpdate(t *testing.T) {
54
local := tu.RandPeerIDFatal(t)
54
- m := peer.NewMetrics()
55
+ m := pstore.NewMetrics()
56
rt := NewRoutingTable(10, ConvertPeerID(local), time.Hour, m)
57
58
peers := make([]peer.ID, 100)
@@ -75,7 +76,7 @@ func TestTableUpdate(t *testing.T) {
76
77
func TestTableFind(t *testing.T) {
78
local := tu.RandPeerIDFatal(t)
78
- m := peer.NewMetrics()
79
+ m := pstore.NewMetrics()
80
rt := NewRoutingTable(10, ConvertPeerID(local), time.Hour, m)
81
82
peers := make([]peer.ID, 100)
@@ -93,7 +94,7 @@ func TestTableFind(t *testing.T) {
94
95
func TestTableFindMultiple(t *testing.T) {
96
local := tu.RandPeerIDFatal(t)
96
- m := peer.NewMetrics()
97
+ m := pstore.NewMetrics()
98
rt := NewRoutingTable(20, ConvertPeerID(local), time.Hour, m)
99
100
peers := make([]peer.ID, 100)
@@ -114,7 +115,7 @@ func TestTableFindMultiple(t *testing.T) {
115
// and set GOMAXPROCS above 1
116
func TestTableMultithreaded(t *testing.T) {
117
local := peer.ID("localPeer")
117
- m := peer.NewMetrics()
118
+ m := pstore.NewMetrics()
119
tab := NewRoutingTable(20, ConvertPeerID(local), time.Hour, m)
120
var peers []peer.ID
121
for i := 0; i < 500; i++ {
@@ -153,7 +154,7 @@ func TestTableMultithreaded(t *testing.T) {
154
func BenchmarkUpdates(b *testing.B) {
155
b.StopTimer()
156
local := ConvertKey("localKey")
156
- m := peer.NewMetrics()
157
+ m := pstore.NewMetrics()
158
tab := NewRoutingTable(20, local, time.Hour, m)
159
160
var peers []peer.ID
@@ -170,7 +171,7 @@ func BenchmarkUpdates(b *testing.B) {
171
func BenchmarkFinds(b *testing.B) {
172
b.StopTimer()
173
local := ConvertKey("localKey")
173
- m := peer.NewMetrics()
174
+ m := pstore.NewMetrics()
175
tab := NewRoutingTable(20, local, time.Hour, m)
176
177
var peers []peer.ID
routing/kbucket/util.go
+1
-1
@@ -7,8 +7,8 @@ import (
7
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
ks "github.com/ipfs/go-ipfs/routing/keyspace"
10
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
11
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
12
)
13
14
// Returned if a routing table query returns no results. This is NOT expected
routing/mock/centralized_client.go
+9
-7
@@ -9,12 +9,14 @@ import (
9
routing "github.com/ipfs/go-ipfs/routing"
10
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
11
"github.com/ipfs/go-ipfs/thirdparty/testutil"
12
+
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
15
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
17
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
17
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
20
)
21
22
var log = logging.Logger("mockrouter")
@@ -72,17 +74,17 @@ func (c *client) GetValues(ctx context.Context, key key.Key, count int) ([]routi
74
return []routing.RecvdVal{{Val: data, From: c.peer.ID()}}, nil
75
}
76
75
-func (c *client) FindProviders(ctx context.Context, key key.Key) ([]peer.PeerInfo, error) {
77
+func (c *client) FindProviders(ctx context.Context, key key.Key) ([]pstore.PeerInfo, error) {
78
return c.server.Providers(key), nil
79
}
80
79
-func (c *client) FindPeer(ctx context.Context, pid peer.ID) (peer.PeerInfo, error) {
81
+func (c *client) FindPeer(ctx context.Context, pid peer.ID) (pstore.PeerInfo, error) {
82
log.Debugf("FindPeer: %s", pid)
81
- return peer.PeerInfo{}, nil
83
+ return pstore.PeerInfo{}, nil
84
}
85
84
-func (c *client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan peer.PeerInfo {
85
- out := make(chan peer.PeerInfo)
86
+func (c *client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
87
+ out := make(chan pstore.PeerInfo)
88
go func() {
89
defer close(out)
90
for i, p := range c.server.Providers(k) {
@@ -102,7 +104,7 @@ func (c *client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-c
104
// Provide returns once the message is on the network. Value is not necessarily
105
// visible yet.
106
func (c *client) Provide(_ context.Context, key key.Key) error {
105
- info := peer.PeerInfo{
107
+ info := pstore.PeerInfo{
108
ID: c.peer.ID(),
109
Addrs: []ma.Multiaddr{c.peer.Address()},
110
}
routing/mock/centralized_server.go
+9
-7
@@ -9,14 +9,16 @@ import (
9
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
"github.com/ipfs/go-ipfs/thirdparty/testutil"
12
+
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
)
17
18
// server is the mockrouting.Client's private interface to the routing server
19
type server interface {
18
- Announce(peer.PeerInfo, key.Key) error
19
- Providers(key.Key) []peer.PeerInfo
20
+ Announce(pstore.PeerInfo, key.Key) error
21
+ Providers(key.Key) []pstore.PeerInfo
22
23
Server
24
}
@@ -30,11 +32,11 @@ type s struct {
32
}
33
34
type providerRecord struct {
33
- Peer peer.PeerInfo
35
+ Peer pstore.PeerInfo
36
Created time.Time
37
}
38
37
-func (rs *s) Announce(p peer.PeerInfo, k key.Key) error {
39
+func (rs *s) Announce(p pstore.PeerInfo, k key.Key) error {
40
rs.lock.Lock()
41
defer rs.lock.Unlock()
42
@@ -49,13 +51,13 @@ func (rs *s) Announce(p peer.PeerInfo, k key.Key) error {
51
return nil
52
}
53
52
-func (rs *s) Providers(k key.Key) []peer.PeerInfo {
54
+func (rs *s) Providers(k key.Key) []pstore.PeerInfo {
55
rs.delayConf.Query.Wait() // before locking
56
57
rs.lock.RLock()
58
defer rs.lock.RUnlock()
59
58
- var ret []peer.PeerInfo
60
+ var ret []pstore.PeerInfo
61
records, ok := rs.providers[k]
62
if !ok {
63
return ret
routing/mock/centralized_test.go
+3
-2
@@ -7,8 +7,9 @@ import (
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9
"github.com/ipfs/go-ipfs/thirdparty/testutil"
10
+
11
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
12
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
13
)
14
15
func TestKeyNotFound(t *testing.T) {
@@ -150,7 +151,7 @@ func TestValidAfter(t *testing.T) {
151
152
rs.Client(pi).Provide(ctx, key)
153
153
- var providers []peer.PeerInfo
154
+ var providers []pstore.PeerInfo
155
providers, err := rs.Client(pi).FindProviders(ctx, key)
156
if err != nil {
157
t.Fatal(err)
routing/mock/dht.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
6
dht "github.com/ipfs/go-ipfs/routing/dht"
7
"github.com/ipfs/go-ipfs/thirdparty/testutil"
8
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
8
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
9
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
)
11
routing/mock/interface.go
+3
-2
@@ -10,8 +10,9 @@ import (
10
routing "github.com/ipfs/go-ipfs/routing"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
"github.com/ipfs/go-ipfs/thirdparty/testutil"
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
16
)
17
18
// Server provides mockrouting Clients
@@ -22,7 +23,7 @@ type Server interface {
23
24
// Client implements IpfsRouting
25
type Client interface {
25
- FindProviders(context.Context, key.Key) ([]peer.PeerInfo, error)
26
+ FindProviders(context.Context, key.Key) ([]pstore.PeerInfo, error)
27
routing.IpfsRouting
28
}
29
routing/none/none_client.go
+7
-6
@@ -6,10 +6,11 @@ import (
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
repo "github.com/ipfs/go-ipfs/repo"
8
routing "github.com/ipfs/go-ipfs/routing"
9
- p2phost "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
+ p2phost "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
11
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
12
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
12
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
)
15
16
var log = logging.Logger("mockrouter")
@@ -29,12 +30,12 @@ func (c *nilclient) GetValues(_ context.Context, _ key.Key, _ int) ([]routing.Re
30
return nil, errors.New("Tried GetValues from nil routing.")
31
}
32
32
-func (c *nilclient) FindPeer(_ context.Context, _ peer.ID) (peer.PeerInfo, error) {
33
- return peer.PeerInfo{}, nil
33
+func (c *nilclient) FindPeer(_ context.Context, _ peer.ID) (pstore.PeerInfo, error) {
34
+ return pstore.PeerInfo{}, nil
35
}
36
36
-func (c *nilclient) FindProvidersAsync(_ context.Context, _ key.Key, _ int) <-chan peer.PeerInfo {
37
- out := make(chan peer.PeerInfo)
37
+func (c *nilclient) FindProvidersAsync(_ context.Context, _ key.Key, _ int) <-chan pstore.PeerInfo {
38
+ out := make(chan pstore.PeerInfo)
39
defer close(out)
40
return out
41
}
routing/offline/offline.go
+8
-6
@@ -9,11 +9,13 @@ import (
9
routing "github.com/ipfs/go-ipfs/routing"
10
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
11
record "github.com/ipfs/go-ipfs/routing/record"
12
+
13
+ "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
15
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
17
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
16
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
19
)
20
21
var log = logging.Logger("offlinerouting")
@@ -88,16 +90,16 @@ func (c *offlineRouting) GetValues(ctx context.Context, key key.Key, _ int) ([]r
90
}, nil
91
}
92
91
-func (c *offlineRouting) FindProviders(ctx context.Context, key key.Key) ([]peer.PeerInfo, error) {
93
+func (c *offlineRouting) FindProviders(ctx context.Context, key key.Key) ([]pstore.PeerInfo, error) {
94
return nil, ErrOffline
95
}
96
95
-func (c *offlineRouting) FindPeer(ctx context.Context, pid peer.ID) (peer.PeerInfo, error) {
96
- return peer.PeerInfo{}, ErrOffline
97
+func (c *offlineRouting) FindPeer(ctx context.Context, pid peer.ID) (pstore.PeerInfo, error) {
98
+ return pstore.PeerInfo{}, ErrOffline
99
}
100
99
-func (c *offlineRouting) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan peer.PeerInfo {
100
- out := make(chan peer.PeerInfo)
101
+func (c *offlineRouting) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
102
+ out := make(chan pstore.PeerInfo)
103
close(out)
104
return out
105
}
routing/routing.go
+5
-4
@@ -5,9 +5,10 @@ import (
5
"errors"
6
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
9
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
10
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
12
)
13
14
// ErrNotFound is returned when a search fails to find anything
@@ -16,7 +17,7 @@ var ErrNotFound = errors.New("routing: not found")
17
// IpfsRouting is the routing module interface
18
// It is implemented by things like DHTs, etc.
19
type IpfsRouting interface {
19
- FindProvidersAsync(context.Context, key.Key, int) <-chan peer.PeerInfo
20
+ FindProvidersAsync(context.Context, key.Key, int) <-chan pstore.PeerInfo
21
22
// Basic Put/Get
23
@@ -45,9 +46,9 @@ type IpfsRouting interface {
46
Provide(context.Context, key.Key) error
47
48
// Find specific Peer
48
- // FindPeer searches for a peer with given ID, returns a peer.PeerInfo
49
+ // FindPeer searches for a peer with given ID, returns a pstore.PeerInfo
50
// with relevant addresses.
50
- FindPeer(context.Context, peer.ID) (peer.PeerInfo, error)
51
+ FindPeer(context.Context, peer.ID) (pstore.PeerInfo, error)
52
53
// Bootstrap allows callers to hint to the routing system to get into a
54
// Boostrapped state
routing/supernode/client.go
+16
-16
@@ -5,31 +5,31 @@ import (
5
"errors"
6
"time"
7
8
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
-
11
- "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
12
- logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
-
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
routing "github.com/ipfs/go-ipfs/routing"
10
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
11
proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
12
loggables "github.com/ipfs/go-ipfs/thirdparty/loggables"
13
+
14
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
15
+ "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
16
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
17
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
18
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
+ logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
20
)
21
22
var log = logging.Logger("supernode")
23
24
type Client struct {
25
peerhost host.Host
26
- peerstore peer.Peerstore
26
+ peerstore pstore.Peerstore
27
proxy proxy.Proxy
28
local peer.ID
29
}
30
31
// TODO take in datastore/cache
32
-func NewClient(px proxy.Proxy, h host.Host, ps peer.Peerstore, local peer.ID) (*Client, error) {
32
+func NewClient(px proxy.Proxy, h host.Host, ps pstore.Peerstore, local peer.ID) (*Client, error) {
33
return &Client{
34
proxy: px,
35
local: local,
@@ -38,10 +38,10 @@ func NewClient(px proxy.Proxy, h host.Host, ps peer.Peerstore, local peer.ID) (*
38
}, nil
39
}
40
41
-func (c *Client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan peer.PeerInfo {
41
+func (c *Client) FindProvidersAsync(ctx context.Context, k key.Key, max int) <-chan pstore.PeerInfo {
42
logging.ContextWithLoggable(ctx, loggables.Uuid("findProviders"))
43
defer log.EventBegin(ctx, "findProviders", &k).Done()
44
- ch := make(chan peer.PeerInfo)
44
+ ch := make(chan pstore.PeerInfo)
45
go func() {
46
defer close(ch)
47
request := pb.NewMessage(pb.Message_GET_PROVIDERS, string(k), 0)
@@ -105,7 +105,7 @@ func (c *Client) Provide(ctx context.Context, k key.Key) error {
105
// FIXME how is connectedness defined for the local node
106
pri := []pb.PeerRoutingInfo{
107
{
108
- PeerInfo: peer.PeerInfo{
108
+ PeerInfo: pstore.PeerInfo{
109
ID: c.local,
110
Addrs: c.peerhost.Addrs(),
111
},
@@ -115,23 +115,23 @@ func (c *Client) Provide(ctx context.Context, k key.Key) error {
115
return c.proxy.SendMessage(ctx, msg) // TODO wrap to hide remote
116
}
117
118
-func (c *Client) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, error) {
118
+func (c *Client) FindPeer(ctx context.Context, id peer.ID) (pstore.PeerInfo, error) {
119
defer log.EventBegin(ctx, "findPeer", id).Done()
120
request := pb.NewMessage(pb.Message_FIND_NODE, string(id), 0)
121
response, err := c.proxy.SendRequest(ctx, request) // hide remote
122
if err != nil {
123
- return peer.PeerInfo{}, err
123
+ return pstore.PeerInfo{}, err
124
}
125
for _, p := range pb.PBPeersToPeerInfos(response.GetCloserPeers()) {
126
if p.ID == id {
127
return p, nil
128
}
129
}
130
- return peer.PeerInfo{}, errors.New("could not find peer")
130
+ return pstore.PeerInfo{}, errors.New("could not find peer")
131
}
132
133
// creates and signs a record for the given key/value pair
134
-func makeRecord(ps peer.Peerstore, p peer.ID, k key.Key, v []byte) (*pb.Record, error) {
134
+func makeRecord(ps pstore.Peerstore, p peer.ID, k key.Key, v []byte) (*pb.Record, error) {
135
blob := bytes.Join([][]byte{[]byte(k), v, []byte(p)}, []byte{})
136
sig, err := ps.PrivKey(p).Sign(blob)
137
if err != nil {
routing/supernode/proxy/loopback.go
+2
-2
@@ -5,8 +5,8 @@ import (
5
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
6
7
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
8
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
9
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
8
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
9
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
10
)
11
12
// RequestHandler handles routing requests locally
routing/supernode/proxy/standard.go
+10
-9
@@ -6,10 +6,11 @@ import (
6
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
7
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
9
- host "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/host"
10
- inet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net"
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
+ host "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/host"
11
+ inet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net"
12
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
13
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
12
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
15
key "github.com/ipfs/go-ipfs/blocks/key"
16
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
@@ -31,11 +32,11 @@ type Proxy interface {
32
type standard struct {
33
Host host.Host
34
34
- remoteInfos []peer.PeerInfo // addr required for bootstrapping
35
- remoteIDs []peer.ID // []ID is required for each req. here, cached for performance.
35
+ remoteInfos []pstore.PeerInfo // addr required for bootstrapping
36
+ remoteIDs []peer.ID // []ID is required for each req. here, cached for performance.
37
}
38
38
-func Standard(h host.Host, remotes []peer.PeerInfo) Proxy {
39
+func Standard(h host.Host, remotes []pstore.PeerInfo) Proxy {
40
var ids []peer.ID
41
for _, remote := range remotes {
42
ids = append(ids, remote.ID)
@@ -44,7 +45,7 @@ func Standard(h host.Host, remotes []peer.PeerInfo) Proxy {
45
}
46
47
func (px *standard) Bootstrap(ctx context.Context) error {
47
- var cxns []peer.PeerInfo
48
+ var cxns []pstore.PeerInfo
49
for _, info := range px.remoteInfos {
50
if err := px.Host.Connect(ctx, info); err != nil {
51
continue
@@ -97,7 +98,7 @@ func (px *standard) sendMessage(ctx context.Context, m *dhtpb.Message, remote pe
98
}
99
e.Done()
100
}()
100
- if err = px.Host.Connect(ctx, peer.PeerInfo{ID: remote}); err != nil {
101
+ if err = px.Host.Connect(ctx, pstore.PeerInfo{ID: remote}); err != nil {
102
return err
103
}
104
s, err := px.Host.NewStream(ctx, ProtocolSNR, remote)
@@ -131,7 +132,7 @@ func (px *standard) SendRequest(ctx context.Context, m *dhtpb.Message) (*dhtpb.M
132
func (px *standard) sendRequest(ctx context.Context, m *dhtpb.Message, remote peer.ID) (*dhtpb.Message, error) {
133
e := log.EventBegin(ctx, "sendRoutingRequest", px.Host.ID(), remote, logging.Pair("request", m))
134
defer e.Done()
134
- if err := px.Host.Connect(ctx, peer.PeerInfo{ID: remote}); err != nil {
135
+ if err := px.Host.Connect(ctx, pstore.PeerInfo{ID: remote}); err != nil {
136
e.SetError(err)
137
return nil, err
138
}
routing/supernode/server.go
+10
-9
@@ -5,26 +5,27 @@ import (
5
"fmt"
6
7
datastore "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
8
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
9
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
-
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
10
record "github.com/ipfs/go-ipfs/routing/record"
11
proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
15
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
12
+
13
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
14
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
15
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
16
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
)
18
19
// Server handles routing queries using a database backend
20
type Server struct {
21
local peer.ID
22
routingBackend datastore.Datastore
22
- peerstore peer.Peerstore
23
+ peerstore pstore.Peerstore
24
*proxy.Loopback // so server can be injected into client
25
}
26
27
// NewServer creates a new Supernode routing Server
27
-func NewServer(ds datastore.Datastore, ps peer.Peerstore, local peer.ID) (*Server, error) {
28
+func NewServer(ds datastore.Datastore, ps pstore.Peerstore, local peer.ID) (*Server, error) {
29
s := &Server{local, ds, ps, nil}
30
s.Loopback = &proxy.Loopback{
31
Handler: s,
@@ -169,7 +170,7 @@ func putRoutingProviders(ds datastore.Datastore, k key.Key, newRecords []*dhtpb.
170
return ds.Put(providerKey(k), data)
171
}
172
172
-func storeProvidersToPeerstore(ps peer.Peerstore, p peer.ID, providers []*dhtpb.Message_Peer) {
173
+func storeProvidersToPeerstore(ps pstore.Peerstore, p peer.ID, providers []*dhtpb.Message_Peer) {
174
for _, provider := range providers {
175
providerID := peer.ID(provider.GetId())
176
if providerID != p {
@@ -178,7 +179,7 @@ func storeProvidersToPeerstore(ps peer.Peerstore, p peer.ID, providers []*dhtpb.
179
}
180
for _, maddr := range provider.Addresses() {
181
// as a router, we want to store addresses for peers who have provided
181
- ps.AddAddr(p, maddr, peer.AddressTTL)
182
+ ps.AddAddr(p, maddr, pstore.AddressTTL)
183
}
184
}
185
}
@@ -203,7 +204,7 @@ func providerKey(k key.Key) datastore.Key {
204
return datastore.KeyWithNamespaces([]string{"routing", "providers", k.String()})
205
}
206
206
-func verify(ps peer.Peerstore, r *dhtpb.Record) error {
207
+func verify(ps pstore.Peerstore, r *dhtpb.Record) error {
208
v := make(record.Validator)
209
v["pk"] = record.PublicKeyValidator
210
p := peer.ID(r.GetAuthor())
test/integration/addcat_test.go
+4
-4
@@ -18,9 +18,9 @@ import (
18
mock "github.com/ipfs/go-ipfs/core/mock"
19
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
20
"github.com/ipfs/go-ipfs/thirdparty/unit"
21
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
21
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
22
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
23
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
23
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
24
)
25
26
var log = logging.Logger("epictest")
@@ -123,8 +123,8 @@ func DirectAddCat(data []byte, conf testutil.LatencyConfig) error {
123
return err
124
}
125
126
- bs1 := []peer.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)}
127
- bs2 := []peer.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)}
126
+ bs1 := []pstore.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)}
127
+ bs2 := []pstore.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)}
128
129
if err := catter.Bootstrap(core.BootstrapConfigWithPeers(bs1)); err != nil {
130
return err
test/integration/bench_cat_test.go
+4
-4
@@ -12,9 +12,9 @@ import (
12
mock "github.com/ipfs/go-ipfs/core/mock"
13
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
"github.com/ipfs/go-ipfs/thirdparty/unit"
15
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
15
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
16
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
17
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
)
19
20
func BenchmarkCat1MB(b *testing.B) { benchmarkVarCat(b, unit.MB*1) }
@@ -68,8 +68,8 @@ func benchCat(b *testing.B, data []byte, conf testutil.LatencyConfig) error {
68
return err
69
}
70
71
- bs1 := []peer.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)}
72
- bs2 := []peer.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)}
71
+ bs1 := []pstore.PeerInfo{adder.Peerstore.PeerInfo(adder.Identity)}
72
+ bs2 := []pstore.PeerInfo{catter.Peerstore.PeerInfo(catter.Identity)}
73
74
if err := catter.Bootstrap(core.BootstrapConfigWithPeers(bs1)); err != nil {
75
return err
test/integration/bitswap_wo_routing_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"github.com/ipfs/go-ipfs/blocks"
8
"github.com/ipfs/go-ipfs/core"
9
"github.com/ipfs/go-ipfs/core/mock"
10
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
10
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
)
13
test/integration/grandcentral_test.go
+3
-3
@@ -20,8 +20,8 @@ import (
20
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
21
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
22
"github.com/ipfs/go-ipfs/thirdparty/unit"
23
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
24
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
23
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
24
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
25
)
26
27
func TestSupernodeBootstrappedAddCat(t *testing.T) {
@@ -103,7 +103,7 @@ func InitializeSupernodeNetwork(
103
servers = append(servers, bootstrap)
104
}
105
106
- var bootstrapInfos []peer.PeerInfo
106
+ var bootstrapInfos []pstore.PeerInfo
107
for _, n := range servers {
108
info := n.Peerstore.PeerInfo(n.PeerHost.ID())
109
bootstrapInfos = append(bootstrapInfos, info)
test/integration/three_legged_cat_test.go
+3
-3
@@ -15,8 +15,8 @@ import (
15
mock "github.com/ipfs/go-ipfs/core/mock"
16
testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
"github.com/ipfs/go-ipfs/thirdparty/unit"
18
- mocknet "gx/ipfs/QmRW2xiYTpDLWTHb822ZYbPBoh3dGLJwaXLGS9tnPyWZpq/go-libp2p/p2p/net/mock"
19
- "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
+ mocknet "gx/ipfs/QmQgQeBQxQmJdeUSaDagc8cr2ompDwGn13Cybjdtzfuaki/go-libp2p/p2p/net/mock"
19
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
20
)
21
22
func TestThreeLeggedCatTransfer(t *testing.T) {
@@ -104,7 +104,7 @@ func RunThreeLeggedCat(data []byte, conf testutil.LatencyConfig) error {
104
mn.LinkAll()
105
106
bis := bootstrap.Peerstore.PeerInfo(bootstrap.PeerHost.ID())
107
- bcfg := core.BootstrapConfigWithPeers([]peer.PeerInfo{bis})
107
+ bcfg := core.BootstrapConfigWithPeers([]pstore.PeerInfo{bis})
108
if err := adder.Bootstrap(bcfg); err != nil {
109
return err
110
}
test/supernode_client/main.go
+12
-12
@@ -12,13 +12,9 @@ import (
12
gopath "path"
13
"time"
14
15
- random "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
16
- "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
17
- ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
18
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
-
15
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
16
syncds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
17
+ random "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
18
commands "github.com/ipfs/go-ipfs/commands"
19
core "github.com/ipfs/go-ipfs/core"
20
corehttp "github.com/ipfs/go-ipfs/core/corehttp"
@@ -28,9 +24,13 @@ import (
24
config "github.com/ipfs/go-ipfs/repo/config"
25
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
26
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
27
+ "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
28
unit "github.com/ipfs/go-ipfs/thirdparty/unit"
29
+
30
+ ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
31
+ pstore "gx/ipfs/QmZ62t46e9p7vMYqCmptwQC1RhRv5cpQ5cwoqYspedaXyq/go-libp2p-peerstore"
32
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
33
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
33
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
34
)
35
36
var elog = logging.Logger("gc-client")
@@ -89,9 +89,9 @@ func run() error {
89
addrs = append(addrs, addr)
90
}
91
92
- var infos []peer.PeerInfo
92
+ var infos []pstore.PeerInfo
93
for _, addr := range addrs {
94
- infos = append(infos, peer.PeerInfo{
94
+ infos = append(infos, pstore.PeerInfo{
95
ID: addr.ID(),
96
Addrs: []ma.Multiaddr{addr.Transport()},
97
})
@@ -233,8 +233,8 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
233
return nil
234
}
235
236
-func toPeerInfos(bpeers []config.BootstrapPeer) ([]peer.PeerInfo, error) {
237
- var peers []peer.PeerInfo
236
+func toPeerInfos(bpeers []config.BootstrapPeer) ([]pstore.PeerInfo, error) {
237
+ var peers []pstore.PeerInfo
238
for _, bootstrap := range bpeers {
239
p, err := toPeerInfo(bootstrap)
240
if err != nil {
@@ -245,8 +245,8 @@ func toPeerInfos(bpeers []config.BootstrapPeer) ([]peer.PeerInfo, error) {
245
return peers, nil
246
}
247
248
-func toPeerInfo(bootstrap config.BootstrapPeer) (p peer.PeerInfo, err error) {
249
- p = peer.PeerInfo{
248
+func toPeerInfo(bootstrap config.BootstrapPeer) (p pstore.PeerInfo, err error) {
249
+ p = pstore.PeerInfo{
250
ID: bootstrap.ID(),
251
Addrs: []ma.Multiaddr{bootstrap.Multiaddr()},
252
}
thirdparty/ipfsaddr/ipfsaddr.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
7
8
path "github.com/ipfs/go-ipfs/path"
9
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
10
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
10
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
11
)
12
13
var log = logging.Logger("ipfsaddr")
thirdparty/ipfsaddr/ipfsaddr_test.go
+1
-1
@@ -4,8 +4,8 @@ import (
4
"testing"
5
6
path "github.com/ipfs/go-ipfs/path"
7
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
8
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
8
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
)
10
11
var good = []string{
thirdparty/loggables/loggables.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
16
logging "gx/ipfs/QmaDNZ4QMdBdku1YZWBysufYyoQt1negQGNav6PLYarbY8/go-log"
17
18
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
18
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
19
)
20
21
// NetConn returns an eventlog.Metadata with the conn addresses
thirdparty/peerset/peerset.go
+1
-1
@@ -1,7 +1,7 @@
1
package peerset
2
3
import (
4
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
4
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
5
"sync"
6
)
7
thirdparty/testutil/gen.go
+1
-1
@@ -8,9 +8,9 @@ import (
8
"sync"
9
"testing"
10
11
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
12
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
13
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
14
15
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
16
)
thirdparty/testutil/identity.go
+1
-1
@@ -3,9 +3,9 @@ package testutil
3
import (
4
"testing"
5
6
+ peer "gx/ipfs/QmQGwpJy9P4yXZySmqkZEXCmbBpJUb8xntCv8Ca4taZwDC/go-libp2p-peer"
7
ci "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
8
ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
8
- peer "gx/ipfs/QmbyvM8zRFDkbFdYyt1MnevUMJ62SiSGbfDFZ3Z8nkrzr4/go-libp2p-peer"
9
)
10
11
type Identity interface {