opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-09 23:42:20 +08:00
Code Issues Projects Releases Wiki Activity

introducing p2p pkg

Browse Source 
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.
This commit is contained in:
Juan Batiz-Benet
2014-12-29 05:43:56 -08:00
parent 35c22781ff
commit 89f5cd4c94
81 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ipfs/init.go
View File

@ -15,7 +15,7 @@ import (
ci "github.com/jbenet/go-ipfs/crypto"
imp "github.com/jbenet/go-ipfs/importer"
chunk "github.com/jbenet/go-ipfs/importer/chunk"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
repo "github.com/jbenet/go-ipfs/repo"
u "github.com/jbenet/go-ipfs/util"
debugerror "github.com/jbenet/go-ipfs/util/debugerror"

2
cmd/seccat/seccat.go
View File

@ -20,7 +20,7 @@ import (
ci "github.com/jbenet/go-ipfs/crypto"
secio "github.com/jbenet/go-ipfs/crypto/secio"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
core/bootstrap.go
View File

@ -9,7 +9,7 @@ import (
config "github.com/jbenet/go-ipfs/config"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
dht "github.com/jbenet/go-ipfs/routing/dht"
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
math2 "github.com/jbenet/go-ipfs/util/math2"

2
core/bootstrap_test.go
View File

@ -3,7 +3,7 @@ package core
import (
"testing"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
testutil "github.com/jbenet/go-ipfs/util/testutil"
)

2
core/commands/id.go
View File

@ -12,7 +12,7 @@ import (
cmds "github.com/jbenet/go-ipfs/commands"
ic "github.com/jbenet/go-ipfs/crypto"
"github.com/jbenet/go-ipfs/peer"
"github.com/jbenet/go-ipfs/p2p/peer"
kb "github.com/jbenet/go-ipfs/routing/kbucket"
u "github.com/jbenet/go-ipfs/util"
)

2
core/commands/swarm.go
View File

@ -6,7 +6,7 @@ import (
"path"
cmds "github.com/jbenet/go-ipfs/commands"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
errors "github.com/jbenet/go-ipfs/util/debugerror"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
core/core.go
View File

@ -22,8 +22,8 @@ import (
namesys "github.com/jbenet/go-ipfs/namesys"
inet "github.com/jbenet/go-ipfs/net"
swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
peer "github.com/jbenet/go-ipfs/p2p/peer"
path "github.com/jbenet/go-ipfs/path"
peer "github.com/jbenet/go-ipfs/peer"
pin "github.com/jbenet/go-ipfs/pin"
routing "github.com/jbenet/go-ipfs/routing"
dht "github.com/jbenet/go-ipfs/routing/dht"

2
core/mock.go
View File

@ -12,8 +12,8 @@ import (
mdag "github.com/jbenet/go-ipfs/merkledag"
nsys "github.com/jbenet/go-ipfs/namesys"
"github.com/jbenet/go-ipfs/net/mock"
peer "github.com/jbenet/go-ipfs/p2p/peer"
path "github.com/jbenet/go-ipfs/path"
peer "github.com/jbenet/go-ipfs/peer"
dht "github.com/jbenet/go-ipfs/routing/dht"
ds2 "github.com/jbenet/go-ipfs/util/datastore2"
"github.com/jbenet/go-ipfs/util/testutil"

2
crypto/secio/interface.go
View File

@ -9,7 +9,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// SessionGenerator constructs secure communication sessions for a peer.

2
crypto/secio/protocol.go
View File

@ -12,7 +12,7 @@ import (
ci "github.com/jbenet/go-ipfs/crypto"
pb "github.com/jbenet/go-ipfs/crypto/secio/internal/pb"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
)

2
diagnostics/diag.go
View File

@ -19,7 +19,7 @@ import (
pb "github.com/jbenet/go-ipfs/diagnostics/internal/pb"
net "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
util "github.com/jbenet/go-ipfs/util"
)

2
epictest/core.go
View File

@ -16,8 +16,8 @@ import (
chunk "github.com/jbenet/go-ipfs/importer/chunk"
merkledag "github.com/jbenet/go-ipfs/merkledag"
net "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/p2p/peer"
path "github.com/jbenet/go-ipfs/path"
peer "github.com/jbenet/go-ipfs/peer"
dht "github.com/jbenet/go-ipfs/routing/dht"
uio "github.com/jbenet/go-ipfs/unixfs/io"
util "github.com/jbenet/go-ipfs/util"

2
exchange/bitswap/bitswap.go
View File

@ -17,7 +17,7 @@ import (
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
errors "github.com/jbenet/go-ipfs/util/debugerror"
"github.com/jbenet/go-ipfs/util/delay"

2
exchange/bitswap/decision/engine.go
View File

@ -7,7 +7,7 @@ import (
bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
exchange/bitswap/decision/engine_test.go
View File

@ -11,7 +11,7 @@ import (
blocks "github.com/jbenet/go-ipfs/blocks"
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
message "github.com/jbenet/go-ipfs/exchange/bitswap/message"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
type peerAndEngine struct {

2
exchange/bitswap/decision/ledger.go
View File

@ -4,7 +4,7 @@ import (
"time"
wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
exchange/bitswap/decision/taskqueue.go
View File

@ -4,7 +4,7 @@ import (
"sync"
wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
exchange/bitswap/network/interface.go
View File

@ -4,7 +4,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
exchange/bitswap/network/ipfs_impl.go
View File

@ -4,7 +4,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
util "github.com/jbenet/go-ipfs/util"
)

2
exchange/bitswap/testnet/interface.go
View File

@ -2,7 +2,7 @@ package bitswap
import (
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
"github.com/jbenet/go-ipfs/util/testutil"
)

2
exchange/bitswap/testnet/network_test.go
View File

@ -8,7 +8,7 @@ import (
blocks "github.com/jbenet/go-ipfs/blocks"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
delay "github.com/jbenet/go-ipfs/util/delay"
testutil "github.com/jbenet/go-ipfs/util/testutil"

2
exchange/bitswap/testnet/peernet.go
View File

@ -5,7 +5,7 @@ import (
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
mockpeernet "github.com/jbenet/go-ipfs/net/mock"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
testutil "github.com/jbenet/go-ipfs/util/testutil"
)

2
exchange/bitswap/testnet/virtual.go
View File

@ -7,7 +7,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
util "github.com/jbenet/go-ipfs/util"

2
exchange/bitswap/testutils.go
View File

@ -9,7 +9,7 @@ import (
blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
exchange "github.com/jbenet/go-ipfs/exchange"
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
delay "github.com/jbenet/go-ipfs/util/delay"
testutil "github.com/jbenet/go-ipfs/util/testutil"

2
net/backpressure/backpressure_test.go
View File

@ -9,7 +9,7 @@ import (
inet "github.com/jbenet/go-ipfs/net"
netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
net/conn/conn.go
View File

@ -12,7 +12,7 @@ import (
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
ic "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
)

2
net/conn/dial.go
View File

@ -8,7 +8,7 @@ import (
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
debugerror "github.com/jbenet/go-ipfs/util/debugerror"
)

2
net/conn/interface.go
View File

@ -6,7 +6,7 @@ import (
"time"
ic "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
msgio "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"

2
net/conn/listen.go
View File

@ -10,7 +10,7 @@ import (
manet "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
ic "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// listener is an object that can accept connections. It implements Listener

2
net/conn/secure_conn.go
View File

@ -10,7 +10,7 @@ import (
ic "github.com/jbenet/go-ipfs/crypto"
secio "github.com/jbenet/go-ipfs/crypto/secio"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
errors "github.com/jbenet/go-ipfs/util/debugerror"
)

2
net/interface.go
View File

@ -5,7 +5,7 @@ import (
conn "github.com/jbenet/go-ipfs/net/conn"
// swarm "github.com/jbenet/go-ipfs/net/swarm2"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"

2
net/mock/interface.go
View File

@ -12,7 +12,7 @@ import (
ic "github.com/jbenet/go-ipfs/crypto"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
)

2
net/mock/mock_conn.go
View File

@ -7,7 +7,7 @@ import (
ic "github.com/jbenet/go-ipfs/crypto"
inet "github.com/jbenet/go-ipfs/net"
mux "github.com/jbenet/go-ipfs/net/services/mux"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
)

2
net/mock/mock_link.go
View File

@ -5,7 +5,7 @@ import (
"sync"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// link implements mocknet.Link

2
net/mock/mock_net.go
View File

@ -6,7 +6,7 @@ import (
ic "github.com/jbenet/go-ipfs/crypto"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
testutil "github.com/jbenet/go-ipfs/util/testutil"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
net/mock/mock_peernet.go
View File

@ -10,7 +10,7 @@ import (
ids "github.com/jbenet/go-ipfs/net/services/identify"
mux "github.com/jbenet/go-ipfs/net/services/mux"
relay "github.com/jbenet/go-ipfs/net/services/relay"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"

2
net/mock/mock_printer.go
View File

@ -5,7 +5,7 @@ import (
"io"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// separate object so our interfaces are separate :)

2
net/mock/mock_test.go
View File

@ -8,7 +8,7 @@ import (
"testing"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
testutil "github.com/jbenet/go-ipfs/util/testutil"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
net/services/identify/id_test.go
View File

@ -7,7 +7,7 @@ import (
inet "github.com/jbenet/go-ipfs/net"
handshake "github.com/jbenet/go-ipfs/net/handshake"
netutil "github.com/jbenet/go-ipfs/net/swarmnet/util"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"

2
net/services/relay/relay.go
View File

@ -9,7 +9,7 @@ import (
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
)

2
net/swarm/simul_test.go
View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"

2
net/swarm/swarm.go
View File

@ -3,7 +3,7 @@
package swarm
import (
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
net/swarm/swarm_conn.go
View File

@ -5,7 +5,7 @@ import (
ic "github.com/jbenet/go-ipfs/crypto"
conn "github.com/jbenet/go-ipfs/net/conn"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"

2
net/swarm/swarm_dial.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
conn "github.com/jbenet/go-ipfs/net/conn"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
net/swarm/swarm_test.go
View File

@ -7,7 +7,7 @@ import (
"testing"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
errors "github.com/jbenet/go-ipfs/util/debugerror"
testutil "github.com/jbenet/go-ipfs/util/testutil"

2
net/swarmnet/net.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
ic "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
inet "github.com/jbenet/go-ipfs/net"
ids "github.com/jbenet/go-ipfs/net/services/identify"

2
net/swarmnet/util/util.go
View File

@ -5,7 +5,7 @@ import (
inet "github.com/jbenet/go-ipfs/net"
sn "github.com/jbenet/go-ipfs/net/swarmnet"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
tu "github.com/jbenet/go-ipfs/util/testutil"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

0
peer/metrics.go → p2p/peer/metrics.go
View File

2
peer/metrics_test.go → p2p/peer/metrics_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
testutil "github.com/jbenet/go-ipfs/util/testutil"
)

0
peer/peer.go → p2p/peer/peer.go
View File

0
peer/peer_test.go → p2p/peer/peer_test.go
View File

0
peer/peerstore.go → p2p/peer/peerstore.go
View File

0
peer/peerstore_test.go → p2p/peer/peerstore_test.go
View File

2
peer/queue/distance.go → p2p/peer/queue/distance.go
View File

@ -5,7 +5,7 @@ import (
"math/big"
"sync"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
ks "github.com/jbenet/go-ipfs/routing/keyspace"
u "github.com/jbenet/go-ipfs/util"
)

2
peer/queue/interface.go → p2p/peer/queue/interface.go
View File

@ -1,6 +1,6 @@
package queue
import peer "github.com/jbenet/go-ipfs/peer"
import peer "github.com/jbenet/go-ipfs/p2p/peer"
// PeerQueue maintains a set of peers ordered according to a metric.
// Implementations of PeerQueue could order peers based on distances along

2
peer/queue/queue_test.go → p2p/peer/queue/queue_test.go
View File

@ -6,7 +6,7 @@ import (
"testing"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
peer/queue/sync.go → p2p/peer/queue/sync.go
View File

@ -3,7 +3,7 @@ package queue
import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// ChanQueue makes any PeerQueue synchronizable through channels.

2
routing/dht/dht.go
View File

@ -11,7 +11,7 @@ import (
"time"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
kb "github.com/jbenet/go-ipfs/routing/kbucket"

2
routing/dht/dht_net.go
View File

@ -5,7 +5,7 @@ import (
"time"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
ctxutil "github.com/jbenet/go-ipfs/util/ctx"

2
routing/dht/dht_test.go
View File

@ -15,7 +15,7 @@ import (
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
swarmnet "github.com/jbenet/go-ipfs/net/swarmnet"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
u "github.com/jbenet/go-ipfs/util"
testutil "github.com/jbenet/go-ipfs/util/testutil"

2
routing/dht/diag.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
type connDiagInfo struct {

2
routing/dht/ext_test.go
View File

@ -6,7 +6,7 @@ import (
inet "github.com/jbenet/go-ipfs/net"
mocknet "github.com/jbenet/go-ipfs/net/mock"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
u "github.com/jbenet/go-ipfs/util"

2
routing/dht/handlers.go
View File

@ -8,7 +8,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
u "github.com/jbenet/go-ipfs/util"
)

2
routing/dht/pb/message.go
View File

@ -4,7 +4,7 @@ import (
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
eventlog "github.com/jbenet/go-ipfs/util/eventlog"
)

2
routing/dht/providers.go
View File

@ -4,7 +4,7 @@ import (
"time"
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

2
routing/dht/providers_test.go
View File

@ -3,7 +3,7 @@ package dht
import (
"testing"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

4
routing/dht/query.go
View File

@ -4,8 +4,8 @@ import (
"sync"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
queue "github.com/jbenet/go-ipfs/peer/queue"
peer "github.com/jbenet/go-ipfs/p2p/peer"
queue "github.com/jbenet/go-ipfs/p2p/peer/queue"
"github.com/jbenet/go-ipfs/routing"
u "github.com/jbenet/go-ipfs/util"
pset "github.com/jbenet/go-ipfs/util/peerset"

2
routing/dht/records.go
View File

@ -10,7 +10,7 @@ import (
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
ci "github.com/jbenet/go-ipfs/crypto"
"github.com/jbenet/go-ipfs/peer"
"github.com/jbenet/go-ipfs/p2p/peer"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
u "github.com/jbenet/go-ipfs/util"
ctxutil "github.com/jbenet/go-ipfs/util/ctx"

2
routing/dht/routing.go
View File

@ -7,7 +7,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
inet "github.com/jbenet/go-ipfs/net"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
"github.com/jbenet/go-ipfs/routing"
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
kb "github.com/jbenet/go-ipfs/routing/kbucket"

2
routing/kbucket/bucket.go
View File

@ -4,7 +4,7 @@ import (
"container/list"
"sync"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// Bucket holds a list of peers.

2
routing/kbucket/table.go
View File

@ -7,7 +7,7 @@ import (
"sync"
"time"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
routing/kbucket/table_test.go
View File

@ -7,7 +7,7 @@ import (
tu "github.com/jbenet/go-ipfs/util/testutil"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
// Test basic features of the bucket struct

2
routing/kbucket/util.go
View File

@ -5,7 +5,7 @@ import (
"crypto/sha256"
"errors"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
ks "github.com/jbenet/go-ipfs/routing/keyspace"
u "github.com/jbenet/go-ipfs/util"
)

2
routing/mock/centralized_client.go
View File

@ -6,7 +6,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
u "github.com/jbenet/go-ipfs/util"
"github.com/jbenet/go-ipfs/util/testutil"

2
routing/mock/centralized_server.go
View File

@ -7,7 +7,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
"github.com/jbenet/go-ipfs/util/testutil"
)

2
routing/mock/centralized_test.go
View File

@ -5,7 +5,7 @@ import (
"time"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
delay "github.com/jbenet/go-ipfs/util/delay"
"github.com/jbenet/go-ipfs/util/testutil"

2
routing/mock/interface.go
View File

@ -7,7 +7,7 @@ package mockrouting
import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
routing "github.com/jbenet/go-ipfs/routing"
u "github.com/jbenet/go-ipfs/util"
delay "github.com/jbenet/go-ipfs/util/delay"

2
routing/routing.go
View File

@ -6,7 +6,7 @@ import (
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
)

2
util/peerset/peerset.go
View File

@ -1,7 +1,7 @@
package peerset
import (
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
"sync"
)

2
util/testutil/gen.go
View File

@ -10,7 +10,7 @@ import (
"testing"
ci "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
u "github.com/jbenet/go-ipfs/util"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"

2
util/testutil/identity.go
View File

@ -5,7 +5,7 @@ import (
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
ci "github.com/jbenet/go-ipfs/crypto"
peer "github.com/jbenet/go-ipfs/peer"
peer "github.com/jbenet/go-ipfs/p2p/peer"
)
type Identity interface {