@cryptotaxi247 / kubo / commits / 89f5cd4c9

introducing p2p pkg

I think it's time to move a lot of the peer-to-peer networking but-not-ipfs-specific things into its own package: p2p. This could in the future be split off into its own library. The first thing to go is the peer.

Juan Batiz-Benet committed Dec 29, 2014 at 05:43 UTC 89f5cd4c94d900f3b1ebbb94212c49376b38b227
81 files changed +77 -77
cmd/ipfs/init.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 ci "github.com/jbenet/go-ipfs/crypto"
16 imp "github.com/jbenet/go-ipfs/importer"
17 chunk "github.com/jbenet/go-ipfs/importer/chunk"
18 - peer "github.com/jbenet/go-ipfs/peer"
18 + peer "github.com/jbenet/go-ipfs/p2p/peer"
19 repo "github.com/jbenet/go-ipfs/repo"
20 u "github.com/jbenet/go-ipfs/util"
21 debugerror "github.com/jbenet/go-ipfs/util/debugerror"
cmd/seccat/seccat.go
+1 -1
@@ -20,7 +20,7 @@ import (
20
21 ci "github.com/jbenet/go-ipfs/crypto"
22 secio "github.com/jbenet/go-ipfs/crypto/secio"
23 - peer "github.com/jbenet/go-ipfs/peer"
23 + peer "github.com/jbenet/go-ipfs/p2p/peer"
24 u "github.com/jbenet/go-ipfs/util"
25 )
26
core/bootstrap.go
+1 -1
@@ -9,7 +9,7 @@ import (
9
10 config "github.com/jbenet/go-ipfs/config"
11 inet "github.com/jbenet/go-ipfs/net"
12 - peer "github.com/jbenet/go-ipfs/peer"
12 + peer "github.com/jbenet/go-ipfs/p2p/peer"
13 dht "github.com/jbenet/go-ipfs/routing/dht"
14 lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
15 math2 "github.com/jbenet/go-ipfs/util/math2"
core/bootstrap_test.go
+1 -1
@@ -3,7 +3,7 @@ package core
3 import (
4 "testing"
5
6 - peer "github.com/jbenet/go-ipfs/peer"
6 + peer "github.com/jbenet/go-ipfs/p2p/peer"
7 testutil "github.com/jbenet/go-ipfs/util/testutil"
8 )
9
core/commands/id.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 cmds "github.com/jbenet/go-ipfs/commands"
14 ic "github.com/jbenet/go-ipfs/crypto"
15 - "github.com/jbenet/go-ipfs/peer"
15 + "github.com/jbenet/go-ipfs/p2p/peer"
16 kb "github.com/jbenet/go-ipfs/routing/kbucket"
17 u "github.com/jbenet/go-ipfs/util"
18 )
core/commands/swarm.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "path"
7
8 cmds "github.com/jbenet/go-ipfs/commands"
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 errors "github.com/jbenet/go-ipfs/util/debugerror"
11
12 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
core/core.go
+1 -1
@@ -22,8 +22,8 @@ import (
22 namesys "github.com/jbenet/go-ipfs/namesys"
23 inet "github.com/jbenet/go-ipfs/net"
24 swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
25 + peer "github.com/jbenet/go-ipfs/p2p/peer"
26 path "github.com/jbenet/go-ipfs/path"
26 - peer "github.com/jbenet/go-ipfs/peer"
27 pin "github.com/jbenet/go-ipfs/pin"
28 routing "github.com/jbenet/go-ipfs/routing"
29 dht "github.com/jbenet/go-ipfs/routing/dht"
core/mock.go
+1 -1
@@ -12,8 +12,8 @@ import (
12 mdag "github.com/jbenet/go-ipfs/merkledag"
13 nsys "github.com/jbenet/go-ipfs/namesys"
14 "github.com/jbenet/go-ipfs/net/mock"
15 + peer "github.com/jbenet/go-ipfs/p2p/peer"
16 path "github.com/jbenet/go-ipfs/path"
16 - peer "github.com/jbenet/go-ipfs/peer"
17 dht "github.com/jbenet/go-ipfs/routing/dht"
18 ds2 "github.com/jbenet/go-ipfs/util/datastore2"
19 "github.com/jbenet/go-ipfs/util/testutil"
crypto/secio/interface.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10 msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
11
12 - peer "github.com/jbenet/go-ipfs/peer"
12 + peer "github.com/jbenet/go-ipfs/p2p/peer"
13 )
14
15 // SessionGenerator constructs secure communication sessions for a peer.
crypto/secio/protocol.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 ci "github.com/jbenet/go-ipfs/crypto"
14 pb "github.com/jbenet/go-ipfs/crypto/secio/internal/pb"
15 - peer "github.com/jbenet/go-ipfs/peer"
15 + peer "github.com/jbenet/go-ipfs/p2p/peer"
16 u "github.com/jbenet/go-ipfs/util"
17 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18 )
diagnostics/diag.go
+1 -1
@@ -19,7 +19,7 @@ import (
19
20 pb "github.com/jbenet/go-ipfs/diagnostics/internal/pb"
21 net "github.com/jbenet/go-ipfs/net"
22 - peer "github.com/jbenet/go-ipfs/peer"
22 + peer "github.com/jbenet/go-ipfs/p2p/peer"
23 util "github.com/jbenet/go-ipfs/util"
24 )
25
epictest/core.go
+1 -1
@@ -16,8 +16,8 @@ import (
16 chunk "github.com/jbenet/go-ipfs/importer/chunk"
17 merkledag "github.com/jbenet/go-ipfs/merkledag"
18 net "github.com/jbenet/go-ipfs/net"
19 + peer "github.com/jbenet/go-ipfs/p2p/peer"
20 path "github.com/jbenet/go-ipfs/path"
20 - peer "github.com/jbenet/go-ipfs/peer"
21 dht "github.com/jbenet/go-ipfs/routing/dht"
22 uio "github.com/jbenet/go-ipfs/unixfs/io"
23 util "github.com/jbenet/go-ipfs/util"
exchange/bitswap/bitswap.go
+1 -1
@@ -17,7 +17,7 @@ import (
17 bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
18 notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
19 wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
20 - peer "github.com/jbenet/go-ipfs/peer"
20 + peer "github.com/jbenet/go-ipfs/p2p/peer"
21 u "github.com/jbenet/go-ipfs/util"
22 errors "github.com/jbenet/go-ipfs/util/debugerror"
23 "github.com/jbenet/go-ipfs/util/delay"
exchange/bitswap/decision/engine.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
8 bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
9 wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 u "github.com/jbenet/go-ipfs/util"
12 )
13
exchange/bitswap/decision/engine_test.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 blocks "github.com/jbenet/go-ipfs/blocks"
12 blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
13 message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
14 - peer "github.com/jbenet/go-ipfs/peer"
14 + peer "github.com/jbenet/go-ipfs/p2p/peer"
15 )
16
17 type peerAndEngine struct {
exchange/bitswap/decision/ledger.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "time"
5
6 wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 u "github.com/jbenet/go-ipfs/util"
9 )
10
exchange/bitswap/decision/taskqueue.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "sync"
5
6 wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 u "github.com/jbenet/go-ipfs/util"
9 )
10
exchange/bitswap/network/interface.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6 bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 u "github.com/jbenet/go-ipfs/util"
9 )
10
exchange/bitswap/network/ipfs_impl.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5 bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
6 inet "github.com/jbenet/go-ipfs/net"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 routing "github.com/jbenet/go-ipfs/routing"
9 util "github.com/jbenet/go-ipfs/util"
10 )
exchange/bitswap/testnet/interface.go
+1 -1
@@ -2,7 +2,7 @@ package bitswap
2
3 import (
4 bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
5 - peer "github.com/jbenet/go-ipfs/peer"
5 + peer "github.com/jbenet/go-ipfs/p2p/peer"
6 "github.com/jbenet/go-ipfs/util/testutil"
7 )
8
exchange/bitswap/testnet/network_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 blocks "github.com/jbenet/go-ipfs/blocks"
9 bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
10 bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
11 - peer "github.com/jbenet/go-ipfs/peer"
11 + peer "github.com/jbenet/go-ipfs/p2p/peer"
12 mockrouting "github.com/jbenet/go-ipfs/routing/mock"
13 delay "github.com/jbenet/go-ipfs/util/delay"
14 testutil "github.com/jbenet/go-ipfs/util/testutil"
exchange/bitswap/testnet/peernet.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
6 bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
7 mockpeernet "github.com/jbenet/go-ipfs/net/mock"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 mockrouting "github.com/jbenet/go-ipfs/routing/mock"
10 testutil "github.com/jbenet/go-ipfs/util/testutil"
11 )
exchange/bitswap/testnet/virtual.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8 bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
9 bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 routing "github.com/jbenet/go-ipfs/routing"
12 mockrouting "github.com/jbenet/go-ipfs/routing/mock"
13 util "github.com/jbenet/go-ipfs/util"
exchange/bitswap/testutils.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
10 exchange "github.com/jbenet/go-ipfs/exchange"
11 tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
12 - peer "github.com/jbenet/go-ipfs/peer"
12 + peer "github.com/jbenet/go-ipfs/p2p/peer"
13 datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
14 delay "github.com/jbenet/go-ipfs/util/delay"
15 testutil "github.com/jbenet/go-ipfs/util/testutil"
net/backpressure/backpressure_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9
10 inet "github.com/jbenet/go-ipfs/net"
11 netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
12 - peer "github.com/jbenet/go-ipfs/peer"
12 + peer "github.com/jbenet/go-ipfs/p2p/peer"
13 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
14
15 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/conn/conn.go
+1 -1
@@ -12,7 +12,7 @@ import (
12 manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
13
14 ic "github.com/jbenet/go-ipfs/crypto"
15 - peer "github.com/jbenet/go-ipfs/peer"
15 + peer "github.com/jbenet/go-ipfs/p2p/peer"
16 u "github.com/jbenet/go-ipfs/util"
17 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18 )
net/conn/dial.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9 manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
10
11 - peer "github.com/jbenet/go-ipfs/peer"
11 + peer "github.com/jbenet/go-ipfs/p2p/peer"
12 debugerror "github.com/jbenet/go-ipfs/util/debugerror"
13 )
14
net/conn/interface.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 "time"
7
8 ic "github.com/jbenet/go-ipfs/crypto"
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 u "github.com/jbenet/go-ipfs/util"
11
12 msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
net/conn/listen.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
11
12 ic "github.com/jbenet/go-ipfs/crypto"
13 - peer "github.com/jbenet/go-ipfs/peer"
13 + peer "github.com/jbenet/go-ipfs/p2p/peer"
14 )
15
16 // listener is an object that can accept connections. It implements Listener
net/conn/secure_conn.go
+1 -1
@@ -10,7 +10,7 @@ import (
10
11 ic "github.com/jbenet/go-ipfs/crypto"
12 secio "github.com/jbenet/go-ipfs/crypto/secio"
13 - peer "github.com/jbenet/go-ipfs/peer"
13 + peer "github.com/jbenet/go-ipfs/p2p/peer"
14 errors "github.com/jbenet/go-ipfs/util/debugerror"
15 )
16
net/interface.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 conn "github.com/jbenet/go-ipfs/net/conn"
7 // swarm "github.com/jbenet/go-ipfs/net/swarm2"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11 ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
net/mock/interface.go
+1 -1
@@ -12,7 +12,7 @@ import (
12
13 ic "github.com/jbenet/go-ipfs/crypto"
14 inet "github.com/jbenet/go-ipfs/net"
15 - peer "github.com/jbenet/go-ipfs/peer"
15 + peer "github.com/jbenet/go-ipfs/p2p/peer"
16
17 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
18 )
net/mock/mock_conn.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 ic "github.com/jbenet/go-ipfs/crypto"
8 inet "github.com/jbenet/go-ipfs/net"
9 mux "github.com/jbenet/go-ipfs/net/services/mux"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
13 )
net/mock/mock_link.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "sync"
6
7 inet "github.com/jbenet/go-ipfs/net"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 )
10
11 // link implements mocknet.Link
net/mock/mock_net.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 ic "github.com/jbenet/go-ipfs/crypto"
8 inet "github.com/jbenet/go-ipfs/net"
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 testutil "github.com/jbenet/go-ipfs/util/testutil"
11
12 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/mock/mock_peernet.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 ids "github.com/jbenet/go-ipfs/net/services/identify"
11 mux "github.com/jbenet/go-ipfs/net/services/mux"
12 relay "github.com/jbenet/go-ipfs/net/services/relay"
13 - peer "github.com/jbenet/go-ipfs/peer"
13 + peer "github.com/jbenet/go-ipfs/p2p/peer"
14
15 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
16 ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
net/mock/mock_printer.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6
7 inet "github.com/jbenet/go-ipfs/net"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 )
10
11 // separate object so our interfaces are separate :)
net/mock/mock_test.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 "testing"
9
10 inet "github.com/jbenet/go-ipfs/net"
11 - peer "github.com/jbenet/go-ipfs/peer"
11 + peer "github.com/jbenet/go-ipfs/p2p/peer"
12 testutil "github.com/jbenet/go-ipfs/util/testutil"
13
14 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/services/identify/id_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 inet "github.com/jbenet/go-ipfs/net"
8 handshake "github.com/jbenet/go-ipfs/net/handshake"
9 netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11
12 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
13 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
net/services/relay/relay.go
+1 -1
@@ -9,7 +9,7 @@ import (
9 mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10
11 inet "github.com/jbenet/go-ipfs/net"
12 - peer "github.com/jbenet/go-ipfs/peer"
12 + peer "github.com/jbenet/go-ipfs/p2p/peer"
13 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
14 )
15
net/swarm/simul_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "testing"
6 "time"
7
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
net/swarm/swarm.go
+1 -1
@@ -3,7 +3,7 @@
3 package swarm
4
5 import (
6 - peer "github.com/jbenet/go-ipfs/peer"
6 + peer "github.com/jbenet/go-ipfs/p2p/peer"
7 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
8
9 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/swarm/swarm_conn.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 ic "github.com/jbenet/go-ipfs/crypto"
7 conn "github.com/jbenet/go-ipfs/net/conn"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
net/swarm/swarm_dial.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "fmt"
6
7 conn "github.com/jbenet/go-ipfs/net/conn"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
10
11 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
net/swarm/swarm_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "testing"
8 "time"
9
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 errors "github.com/jbenet/go-ipfs/util/debugerror"
12 testutil "github.com/jbenet/go-ipfs/util/testutil"
13
net/swarmnet/net.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "fmt"
6
7 ic "github.com/jbenet/go-ipfs/crypto"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9
10 inet "github.com/jbenet/go-ipfs/net"
11 ids "github.com/jbenet/go-ipfs/net/services/identify"
net/swarmnet/util/util.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 inet "github.com/jbenet/go-ipfs/net"
7 sn "github.com/jbenet/go-ipfs/net/swarmnet"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 tu "github.com/jbenet/go-ipfs/util/testutil"
10
11 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/peer/metrics.go renamed
p2p/peer/metrics_test.go renamed
+1 -1
@@ -6,7 +6,7 @@ import (
6 "testing"
7 "time"
8
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 testutil "github.com/jbenet/go-ipfs/util/testutil"
11 )
12
p2p/peer/peer.go renamed
p2p/peer/peer_test.go renamed
p2p/peer/peerstore.go renamed
p2p/peer/peerstore_test.go renamed
p2p/peer/queue/distance.go renamed
+1 -1
@@ -5,7 +5,7 @@ import (
5 "math/big"
6 "sync"
7
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 ks "github.com/jbenet/go-ipfs/routing/keyspace"
10 u "github.com/jbenet/go-ipfs/util"
11 )
p2p/peer/queue/interface.go renamed
+1 -1
@@ -1,6 +1,6 @@
1 package queue
2
3 -import peer "github.com/jbenet/go-ipfs/peer"
3 +import peer "github.com/jbenet/go-ipfs/p2p/peer"
4
5 // PeerQueue maintains a set of peers ordered according to a metric.
6 // Implementations of PeerQueue could order peers based on distances along
p2p/peer/queue/queue_test.go renamed
+1 -1
@@ -6,7 +6,7 @@ import (
6 "testing"
7 "time"
8
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 u "github.com/jbenet/go-ipfs/util"
11
12 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
p2p/peer/queue/sync.go renamed
+1 -1
@@ -3,7 +3,7 @@ package queue
3 import (
4 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6 - peer "github.com/jbenet/go-ipfs/peer"
6 + peer "github.com/jbenet/go-ipfs/p2p/peer"
7 )
8
9 // ChanQueue makes any PeerQueue synchronizable through channels.
routing/dht/dht.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 "time"
12
13 inet "github.com/jbenet/go-ipfs/net"
14 - peer "github.com/jbenet/go-ipfs/peer"
14 + peer "github.com/jbenet/go-ipfs/p2p/peer"
15 routing "github.com/jbenet/go-ipfs/routing"
16 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
17 kb "github.com/jbenet/go-ipfs/routing/kbucket"
routing/dht/dht_net.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "time"
6
7 inet "github.com/jbenet/go-ipfs/net"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
10 ctxutil "github.com/jbenet/go-ipfs/util/ctx"
11
routing/dht/dht_test.go
+1 -1
@@ -15,7 +15,7 @@ import (
15 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
16
17 swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
18 - peer "github.com/jbenet/go-ipfs/peer"
18 + peer "github.com/jbenet/go-ipfs/p2p/peer"
19 routing "github.com/jbenet/go-ipfs/routing"
20 u "github.com/jbenet/go-ipfs/util"
21 testutil "github.com/jbenet/go-ipfs/util/testutil"
routing/dht/diag.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "encoding/json"
5 "time"
6
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 )
9
10 type connDiagInfo struct {
routing/dht/ext_test.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 inet "github.com/jbenet/go-ipfs/net"
8 mocknet "github.com/jbenet/go-ipfs/net/mock"
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 routing "github.com/jbenet/go-ipfs/routing"
11 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
12 u "github.com/jbenet/go-ipfs/util"
routing/dht/handlers.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9 proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
10 ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
11 - peer "github.com/jbenet/go-ipfs/peer"
11 + peer "github.com/jbenet/go-ipfs/p2p/peer"
12 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
13 u "github.com/jbenet/go-ipfs/util"
14 )
routing/dht/pb/message.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
5
6 inet "github.com/jbenet/go-ipfs/net"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 eventlog "github.com/jbenet/go-ipfs/util/eventlog"
9 )
10
routing/dht/providers.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "time"
5
6 ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 u "github.com/jbenet/go-ipfs/util"
9
10 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
routing/dht/providers_test.go
+1 -1
@@ -3,7 +3,7 @@ package dht
3 import (
4 "testing"
5
6 - peer "github.com/jbenet/go-ipfs/peer"
6 + peer "github.com/jbenet/go-ipfs/p2p/peer"
7 u "github.com/jbenet/go-ipfs/util"
8
9 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
routing/dht/query.go
+2 -2
@@ -4,8 +4,8 @@ import (
4 "sync"
5
6 inet "github.com/jbenet/go-ipfs/net"
7 - peer "github.com/jbenet/go-ipfs/peer"
8 - queue "github.com/jbenet/go-ipfs/peer/queue"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 + queue "github.com/jbenet/go-ipfs/p2p/peer/queue"
9 "github.com/jbenet/go-ipfs/routing"
10 u "github.com/jbenet/go-ipfs/util"
11 pset "github.com/jbenet/go-ipfs/util/peerset"
routing/dht/records.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
11
12 ci "github.com/jbenet/go-ipfs/crypto"
13 - "github.com/jbenet/go-ipfs/peer"
13 + "github.com/jbenet/go-ipfs/p2p/peer"
14 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
15 u "github.com/jbenet/go-ipfs/util"
16 ctxutil "github.com/jbenet/go-ipfs/util/ctx"
routing/dht/routing.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
9 inet "github.com/jbenet/go-ipfs/net"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 "github.com/jbenet/go-ipfs/routing"
12 pb "github.com/jbenet/go-ipfs/routing/dht/pb"
13 kb "github.com/jbenet/go-ipfs/routing/kbucket"
routing/kbucket/bucket.go
+1 -1
@@ -4,7 +4,7 @@ import (
4 "container/list"
5 "sync"
6
7 - peer "github.com/jbenet/go-ipfs/peer"
7 + peer "github.com/jbenet/go-ipfs/p2p/peer"
8 )
9
10 // Bucket holds a list of peers.
routing/kbucket/table.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "sync"
8 "time"
9
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 u "github.com/jbenet/go-ipfs/util"
12 )
13
routing/kbucket/table_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 tu "github.com/jbenet/go-ipfs/util/testutil"
9
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 )
12
13 // Test basic features of the bucket struct
routing/kbucket/util.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "crypto/sha256"
6 "errors"
7
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 ks "github.com/jbenet/go-ipfs/routing/keyspace"
10 u "github.com/jbenet/go-ipfs/util"
11 )
routing/mock/centralized_client.go
+1 -1
@@ -6,7 +6,7 @@ import (
6 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7 ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
8 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 routing "github.com/jbenet/go-ipfs/routing"
11 u "github.com/jbenet/go-ipfs/util"
12 "github.com/jbenet/go-ipfs/util/testutil"
routing/mock/centralized_server.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9 ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 u "github.com/jbenet/go-ipfs/util"
12 "github.com/jbenet/go-ipfs/util/testutil"
13 )
routing/mock/centralized_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "time"
6
7 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 u "github.com/jbenet/go-ipfs/util"
10 delay "github.com/jbenet/go-ipfs/util/delay"
11 "github.com/jbenet/go-ipfs/util/testutil"
routing/mock/interface.go
+1 -1
@@ -7,7 +7,7 @@ package mockrouting
7 import (
8 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9 ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
10 - peer "github.com/jbenet/go-ipfs/peer"
10 + peer "github.com/jbenet/go-ipfs/p2p/peer"
11 routing "github.com/jbenet/go-ipfs/routing"
12 u "github.com/jbenet/go-ipfs/util"
13 delay "github.com/jbenet/go-ipfs/util/delay"
routing/routing.go
+1 -1
@@ -6,7 +6,7 @@ import (
6
7 context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
9 - peer "github.com/jbenet/go-ipfs/peer"
9 + peer "github.com/jbenet/go-ipfs/p2p/peer"
10 u "github.com/jbenet/go-ipfs/util"
11 )
12
util/peerset/peerset.go
+1 -1
@@ -1,7 +1,7 @@
1 package peerset
2
3 import (
4 - peer "github.com/jbenet/go-ipfs/peer"
4 + peer "github.com/jbenet/go-ipfs/p2p/peer"
5 "sync"
6 )
7
util/testutil/gen.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 "testing"
11
12 ci "github.com/jbenet/go-ipfs/crypto"
13 - peer "github.com/jbenet/go-ipfs/peer"
13 + peer "github.com/jbenet/go-ipfs/p2p/peer"
14 u "github.com/jbenet/go-ipfs/util"
15
16 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
util/testutil/identity.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
7 ci "github.com/jbenet/go-ipfs/crypto"
8 - peer "github.com/jbenet/go-ipfs/peer"
8 + peer "github.com/jbenet/go-ipfs/p2p/peer"
9 )
10
11 type Identity interface {