zishuo/go-libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p.git synced 2025-10-21 15:19:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

rewrote imports to p2p

Browse Source
This commit is contained in:
Juan Batiz-Benet
2015-09-30 19:24:00 -04:00
parent 5dd1bd5e72
commit 2392434b6d
63 changed files with 174 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
p2p/crypto/key.go
View File

@@ -21,9 +21,9 @@ import (
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
pb "github.com/ipfs/go-ipfs/p2p/crypto/pb"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
pb "github.com/ipfs/go-libp2p/p2p/crypto/pb"
) )
var log = logging.Logger("crypto") var log = logging.Logger("crypto")

2
p2p/crypto/key_test.go
View File

@@ -1,7 +1,7 @@
package crypto_test package crypto_test
import ( import (
. "github.com/ipfs/go-ipfs/p2p/crypto" . "github.com/ipfs/go-libp2p/p2p/crypto"
"bytes" "bytes"
tu "github.com/ipfs/go-ipfs/util/testutil" tu "github.com/ipfs/go-ipfs/util/testutil"

2
p2p/crypto/rsa.go
View File

@@ -10,7 +10,7 @@ import (
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto" proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
pb "github.com/ipfs/go-ipfs/p2p/crypto/pb" pb "github.com/ipfs/go-libp2p/p2p/crypto/pb"
) )
type RsaPrivateKey struct { type RsaPrivateKey struct {

2
p2p/crypto/secio/al.go
View File

@@ -14,7 +14,7 @@ import (
"hash" "hash"
bfish "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/crypto/blowfish" bfish "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/crypto/blowfish"
ci "github.com/ipfs/go-ipfs/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
) )
// List of supported ECDH curves // List of supported ECDH curves

4
p2p/crypto/secio/interface.go
View File

@@ -4,11 +4,11 @@ package secio
import ( import (
"io" "io"
ci "github.com/ipfs/go-ipfs/p2p/crypto" ci "github.com/ipfs/go-libp2p/p2p/crypto"
msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// SessionGenerator constructs secure communication sessions for a peer. // SessionGenerator constructs secure communication sessions for a peer.

6
p2p/crypto/secio/protocol.go
View File

@@ -11,11 +11,11 @@ import (
msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ci "github.com/ipfs/go-ipfs/p2p/crypto"
pb "github.com/ipfs/go-ipfs/p2p/crypto/secio/pb"
peer "github.com/ipfs/go-ipfs/p2p/peer"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
ci "github.com/ipfs/go-libp2p/p2p/crypto"
pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb"
peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
var log = logging.Logger("secio") var log = logging.Logger("secio")

4
p2p/discovery/mdns.go
View File

@@ -13,9 +13,9 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
"github.com/ipfs/go-ipfs/p2p/host"
"github.com/ipfs/go-ipfs/p2p/peer"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
"github.com/ipfs/go-libp2p/p2p/host"
"github.com/ipfs/go-libp2p/p2p/peer"
) )
var log = logging.Logger("mdns") var log = logging.Logger("mdns")

14
p2p/host/basic/basic_host.go
View File

@@ -6,15 +6,15 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
metrics "github.com/ipfs/go-ipfs/metrics"
mstream "github.com/ipfs/go-ipfs/metrics/stream"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
metrics "github.com/ipfs/go-libp2p/util/metrics"
mstream "github.com/ipfs/go-libp2p/util/metrics/stream"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
identify "github.com/ipfs/go-ipfs/p2p/protocol/identify" identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
relay "github.com/ipfs/go-ipfs/p2p/protocol/relay" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
) )
var log = logging.Logger("p2p/host/basic") var log = logging.Logger("p2p/host/basic")

6
p2p/host/basic/basic_host_test.go
View File

@@ -5,9 +5,9 @@ import (
"io" "io"
"testing" "testing"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-ipfs/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-ipfs/p2p/test/util" testutil "github.com/ipfs/go-libp2p/p2p/test/util"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
) )

6
p2p/host/basic/natmgr.go
View File

@@ -7,9 +7,9 @@ import (
goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
inat "github.com/ipfs/go-ipfs/p2p/nat" inat "github.com/ipfs/go-libp2p/p2p/nat"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
) )
// natManager takes care of adding + removing port mappings to the nat. // natManager takes care of adding + removing port mappings to the nat.

8
p2p/host/host.go
View File

@@ -3,11 +3,11 @@ package host
import ( import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
metrics "github.com/ipfs/go-ipfs/metrics"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
metrics "github.com/ipfs/go-libp2p/util/metrics"
) )
var log = logging.Logger("p2p/host") var log = logging.Logger("p2p/host")

12
p2p/host/routed/routed.go
View File

@@ -7,14 +7,14 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
metrics "github.com/ipfs/go-ipfs/metrics"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
routing "github.com/ipfs/go-ipfs/routing" routing "github.com/ipfs/go-ipfs/routing"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
metrics "github.com/ipfs/go-libp2p/util/metrics"
) )
var log = logging.Logger("p2p/host/routed") var log = logging.Logger("p2p/host/routed")

8
p2p/net/conn/conn.go
View File

@@ -11,11 +11,11 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ic "github.com/ipfs/go-ipfs/p2p/crypto"
peer "github.com/ipfs/go-ipfs/p2p/peer"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
ic "github.com/ipfs/go-libp2p/p2p/crypto"
peer "github.com/ipfs/go-libp2p/p2p/peer"
lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
) )
var log = logging.Logger("conn") var log = logging.Logger("conn")

6
p2p/net/conn/dial.go
View File

@@ -11,10 +11,10 @@ import (
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
reuseport "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport" reuseport "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// String returns the string rep of d. // String returns the string rep of d.

6
p2p/net/conn/interface.go
View File

@@ -6,9 +6,9 @@ import (
"time" "time"
key "github.com/ipfs/go-ipfs/blocks/key" key "github.com/ipfs/go-ipfs/blocks/key"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
filter "github.com/ipfs/go-ipfs/p2p/net/filter" filter "github.com/ipfs/go-libp2p/p2p/net/filter"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio" msgio "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-msgio"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"

6
p2p/net/conn/listen.go
View File

@@ -13,9 +13,9 @@ import (
goprocessctx "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context" goprocessctx "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
filter "github.com/ipfs/go-ipfs/p2p/net/filter" filter "github.com/ipfs/go-libp2p/p2p/net/filter"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// ConnWrapper is any function that wraps a raw multiaddr connection // ConnWrapper is any function that wraps a raw multiaddr connection

6
p2p/net/conn/secure_conn.go
View File

@@ -8,9 +8,9 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
secio "github.com/ipfs/go-ipfs/p2p/crypto/secio" secio "github.com/ipfs/go-libp2p/p2p/crypto/secio"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// secureConn wraps another Conn object with an encrypted channel. // secureConn wraps another Conn object with an encrypted channel.

2
p2p/net/conn/secure_conn_test.go
View File

@@ -7,8 +7,8 @@ import (
"testing" "testing"
"time" "time"
ic "github.com/ipfs/go-ipfs/p2p/crypto"
travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis" travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
ic "github.com/ipfs/go-libp2p/p2p/crypto"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
) )

4
p2p/net/interface.go
View File

@@ -3,8 +3,8 @@ package net
import ( import (
"io" "io"
conn "github.com/ipfs/go-ipfs/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"

8
p2p/net/mock/interface.go
View File

@@ -7,10 +7,10 @@
package mocknet package mocknet
import ( import (
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
host "github.com/ipfs/go-ipfs/p2p/host" host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
"io" "io"
"time" "time"

6
p2p/net/mock/mock_conn.go
View File

@@ -4,9 +4,9 @@ import (
"container/list" "container/list"
"sync" "sync"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
) )

4
p2p/net/mock/mock_link.go
View File

@@ -6,8 +6,8 @@ import (
"sync" "sync"
"time" "time"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// link implements mocknet.Link // link implements mocknet.Link

12
p2p/net/mock/mock_net.go
View File

@@ -5,13 +5,13 @@ import (
"sort" "sort"
"sync" "sync"
ic "github.com/ipfs/go-ipfs/p2p/crypto"
host "github.com/ipfs/go-ipfs/p2p/host"
bhost "github.com/ipfs/go-ipfs/p2p/host/basic"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
p2putil "github.com/ipfs/go-ipfs/p2p/test/util"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
ic "github.com/ipfs/go-libp2p/p2p/crypto"
host "github.com/ipfs/go-libp2p/p2p/host"
bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"

4
p2p/net/mock/mock_notif_test.go
View File

@@ -6,8 +6,8 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {

4
p2p/net/mock/mock_peernet.go
View File

@@ -5,8 +5,8 @@ import (
"math/rand" "math/rand"
"sync" "sync"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"

4
p2p/net/mock/mock_printer.go
View File

@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"io" "io"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// separate object so our interfaces are separate :) // separate object so our interfaces are separate :)

2
p2p/net/mock/mock_stream.go
View File

@@ -7,7 +7,7 @@ import (
process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
) )
// stream implements inet.Stream // stream implements inet.Stream

6
p2p/net/mock/mock_test.go
View File

@@ -9,10 +9,10 @@ import (
"testing" "testing"
"time" "time"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race" detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

4
p2p/net/swarm/dial_test.go
View File

@@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
ci "github.com/ipfs/go-ipfs/util/testutil/ci" ci "github.com/ipfs/go-ipfs/util/testutil/ci"

2
p2p/net/swarm/peers_test.go
View File

@@ -3,7 +3,7 @@ package swarm
import ( import (
"testing" "testing"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

2
p2p/net/swarm/simul_test.go
View File

@@ -5,8 +5,8 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-ipfs/p2p/peer"
ci "github.com/ipfs/go-ipfs/util/testutil/ci" ci "github.com/ipfs/go-ipfs/util/testutil/ci"
peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

10
p2p/net/swarm/swarm.go
View File

@@ -7,12 +7,12 @@ import (
"sync" "sync"
"time" "time"
metrics "github.com/ipfs/go-ipfs/metrics"
inet "github.com/ipfs/go-ipfs/p2p/net"
filter "github.com/ipfs/go-ipfs/p2p/net/filter"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
peer "github.com/ipfs/go-ipfs/p2p/peer"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
inet "github.com/ipfs/go-libp2p/p2p/net"
filter "github.com/ipfs/go-libp2p/p2p/net/filter"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer "github.com/ipfs/go-libp2p/p2p/peer"
metrics "github.com/ipfs/go-libp2p/util/metrics"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"

4
p2p/net/swarm/swarm_addr.go
View File

@@ -1,8 +1,8 @@
package swarm package swarm
import ( import (
conn "github.com/ipfs/go-ipfs/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
) )

6
p2p/net/swarm/swarm_addr_test.go
View File

@@ -3,10 +3,10 @@ package swarm
import ( import (
"testing" "testing"
metrics "github.com/ipfs/go-ipfs/metrics"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr"
peer "github.com/ipfs/go-ipfs/p2p/peer"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer "github.com/ipfs/go-libp2p/p2p/peer"
metrics "github.com/ipfs/go-libp2p/util/metrics"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

8
p2p/net/swarm/swarm_conn.go
View File

@@ -3,10 +3,10 @@ package swarm
import ( import (
"fmt" "fmt"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
conn "github.com/ipfs/go-ipfs/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"

10
p2p/net/swarm/swarm_dial.go
View File

@@ -8,11 +8,11 @@ import (
"sync" "sync"
"time" "time"
mconn "github.com/ipfs/go-ipfs/metrics/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
conn "github.com/ipfs/go-ipfs/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" peer "github.com/ipfs/go-libp2p/p2p/peer"
peer "github.com/ipfs/go-ipfs/p2p/peer" lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" mconn "github.com/ipfs/go-libp2p/util/metrics/conn"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"

10
p2p/net/swarm/swarm_listen.go
View File

@@ -3,11 +3,11 @@ package swarm
import ( import (
"fmt" "fmt"
mconn "github.com/ipfs/go-ipfs/metrics/conn" inet "github.com/ipfs/go-libp2p/p2p/net"
inet "github.com/ipfs/go-ipfs/p2p/net" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
conn "github.com/ipfs/go-ipfs/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
addrutil "github.com/ipfs/go-ipfs/p2p/net/swarm/addr" lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" mconn "github.com/ipfs/go-libp2p/util/metrics/conn"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"

6
p2p/net/swarm/swarm_net.go
View File

@@ -3,10 +3,10 @@ package swarm
import ( import (
"fmt" "fmt"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
metrics "github.com/ipfs/go-ipfs/metrics" inet "github.com/ipfs/go-libp2p/p2p/net"
inet "github.com/ipfs/go-ipfs/p2p/net" metrics "github.com/ipfs/go-libp2p/util/metrics"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"

4
p2p/net/swarm/swarm_net_test.go
View File

@@ -6,8 +6,8 @@ import (
"time" "time"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
testutil "github.com/ipfs/go-ipfs/p2p/test/util" testutil "github.com/ipfs/go-libp2p/p2p/test/util"
) )
// TestConnectednessCorrect starts a few networks, connects a few // TestConnectednessCorrect starts a few networks, connects a few

4
p2p/net/swarm/swarm_notif_test.go
View File

@@ -7,8 +7,8 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {

2
p2p/net/swarm/swarm_stream.go
View File

@@ -1,7 +1,7 @@
package swarm package swarm
import ( import (
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
) )

6
p2p/net/swarm/swarm_test.go
View File

@@ -9,10 +9,10 @@ import (
"testing" "testing"
"time" "time"
metrics "github.com/ipfs/go-ipfs/metrics"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
metrics "github.com/ipfs/go-libp2p/util/metrics"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

2
p2p/peer/metrics_test.go
View File

@@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-ipfs/p2p/peer"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
func TestLatencyEWMAFun(t *testing.T) { func TestLatencyEWMAFun(t *testing.T) {

2
p2p/peer/peer.go
View File

@@ -11,9 +11,9 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
ic "github.com/ipfs/go-ipfs/p2p/crypto"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
ic "github.com/ipfs/go-libp2p/p2p/crypto"
) )
var log = logging.Logger("peer") var log = logging.Logger("peer")

4
p2p/peer/peer_test.go
View File

@@ -6,10 +6,10 @@ import (
"strings" "strings"
"testing" "testing"
ic "github.com/ipfs/go-ipfs/p2p/crypto"
. "github.com/ipfs/go-ipfs/p2p/peer"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
tu "github.com/ipfs/go-ipfs/util/testutil" tu "github.com/ipfs/go-ipfs/util/testutil"
ic "github.com/ipfs/go-libp2p/p2p/crypto"
. "github.com/ipfs/go-libp2p/p2p/peer"
b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58" b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
) )

2
p2p/peer/peerstore.go
View File

@@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"

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

@@ -6,8 +6,8 @@ import (
"sync" "sync"
key "github.com/ipfs/go-ipfs/blocks/key" key "github.com/ipfs/go-ipfs/blocks/key"
peer "github.com/ipfs/go-ipfs/p2p/peer"
ks "github.com/ipfs/go-ipfs/routing/keyspace" ks "github.com/ipfs/go-ipfs/routing/keyspace"
peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
// peerMetric tracks a peer and its distance to something else. // peerMetric tracks a peer and its distance to something else.

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

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

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

@@ -7,8 +7,8 @@ import (
"time" "time"
key "github.com/ipfs/go-ipfs/blocks/key" key "github.com/ipfs/go-ipfs/blocks/key"
peer "github.com/ipfs/go-ipfs/p2p/peer"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
peer "github.com/ipfs/go-libp2p/p2p/peer"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
) )

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

@@ -2,8 +2,8 @@ package queue
import ( import (
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
peer "github.com/ipfs/go-ipfs/p2p/peer"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
var log = logging.Logger("peerqueue") var log = logging.Logger("peerqueue")

14
p2p/protocol/identify/id.go
View File

@@ -9,15 +9,15 @@ import (
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
mstream "github.com/ipfs/go-ipfs/metrics/stream"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
pb "github.com/ipfs/go-ipfs/p2p/protocol/identify/pb"
config "github.com/ipfs/go-ipfs/repo/config" config "github.com/ipfs/go-ipfs/repo/config"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb"
lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
mstream "github.com/ipfs/go-libp2p/util/metrics/stream"
) )
var log = logging.Logger("net/identify") var log = logging.Logger("net/identify")

8
p2p/protocol/identify/id_test.go
View File

@@ -4,10 +4,10 @@ import (
"testing" "testing"
"time" "time"
host "github.com/ipfs/go-ipfs/p2p/host" host "github.com/ipfs/go-libp2p/p2p/host"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
identify "github.com/ipfs/go-ipfs/p2p/protocol/identify" identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
testutil "github.com/ipfs/go-ipfs/p2p/test/util" testutil "github.com/ipfs/go-libp2p/p2p/test/util"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

2
p2p/protocol/identify/obsaddr.go
View File

@@ -4,7 +4,7 @@ import (
"sync" "sync"
"time" "time"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
) )

4
p2p/protocol/mux.go
View File

@@ -6,9 +6,9 @@ import (
"sync" "sync"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
inet "github.com/ipfs/go-ipfs/p2p/net"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables" inet "github.com/ipfs/go-libp2p/p2p/net"
lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
) )
var log = logging.Logger("net/mux") var log = logging.Logger("net/mux")

2
p2p/protocol/mux_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"testing" "testing"
inet "github.com/ipfs/go-ipfs/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
) )
var testCases = map[string]string{ var testCases = map[string]string{

8
p2p/protocol/ping/ping.go
View File

@@ -8,11 +8,11 @@ import (
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
) )
var log = logging.Logger("ping") var log = logging.Logger("ping")

4
p2p/protocol/ping/ping_test.go
View File

@@ -5,8 +5,8 @@ import (
"time" "time"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
netutil "github.com/ipfs/go-ipfs/p2p/test/util" netutil "github.com/ipfs/go-libp2p/p2p/test/util"
) )
func TestPing(t *testing.T) { func TestPing(t *testing.T) {

8
p2p/protocol/relay/relay.go
View File

@@ -6,11 +6,11 @@ import (
mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash" mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
) )
var log = logging.Logger("p2p/protocol/relay") var log = logging.Logger("p2p/protocol/relay")

8
p2p/protocol/relay/relay_test.go
View File

@@ -4,11 +4,11 @@ import (
"io" "io"
"testing" "testing"
inet "github.com/ipfs/go-ipfs/p2p/net"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
testutil "github.com/ipfs/go-ipfs/p2p/test/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
testutil "github.com/ipfs/go-libp2p/p2p/test/util"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
) )

10
p2p/test/backpressure/backpressure_test.go
View File

@@ -6,12 +6,12 @@ import (
"testing" "testing"
"time" "time"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
peer "github.com/ipfs/go-ipfs/p2p/peer"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
testutil "github.com/ipfs/go-ipfs/p2p/test/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0" logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
peer "github.com/ipfs/go-libp2p/p2p/peer"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/p2p/test/util"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"

12
p2p/test/reconnects/reconnect_test.go
View File

@@ -7,13 +7,13 @@ import (
"testing" "testing"
"time" "time"
host "github.com/ipfs/go-ipfs/p2p/host"
inet "github.com/ipfs/go-ipfs/p2p/net"
swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
protocol "github.com/ipfs/go-ipfs/p2p/protocol"
testutil "github.com/ipfs/go-ipfs/p2p/test/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net"
swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/p2p/test/util"
ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

6
p2p/test/util/key.go
View File

@@ -5,12 +5,12 @@ import (
"io" "io"
"testing" "testing"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
u "github.com/ipfs/go-ipfs/util" u "github.com/ipfs/go-ipfs/util"
testutil "github.com/ipfs/go-ipfs/util/testutil" testutil "github.com/ipfs/go-ipfs/util/testutil"
logging "github.com/ipfs/go-ipfs/vendor/go-log-v1.0.0"
ic "github.com/ipfs/go-ipfs/p2p/crypto" ic "github.com/ipfs/go-libp2p/p2p/crypto"
peer "github.com/ipfs/go-ipfs/p2p/peer" peer "github.com/ipfs/go-libp2p/p2p/peer"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
) )

10
p2p/test/util/util.go
View File

@@ -3,12 +3,12 @@ package testutil
import ( import (
"testing" "testing"
metrics "github.com/ipfs/go-ipfs/metrics"
bhost "github.com/ipfs/go-ipfs/p2p/host/basic"
inet "github.com/ipfs/go-ipfs/p2p/net"
swarm "github.com/ipfs/go-ipfs/p2p/net/swarm"
peer "github.com/ipfs/go-ipfs/p2p/peer"
tu "github.com/ipfs/go-ipfs/util/testutil" tu "github.com/ipfs/go-ipfs/util/testutil"
bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
inet "github.com/ipfs/go-libp2p/p2p/net"
swarm "github.com/ipfs/go-libp2p/p2p/net/swarm"
peer "github.com/ipfs/go-libp2p/p2p/peer"
metrics "github.com/ipfs/go-libp2p/util/metrics"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"