rewrote imports to p2p

p2p/crypto/key.go

@@ -21,9 +21,9 @@ import (
 
 	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"
 	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")

p2p/crypto/key_test.go

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

p2p/crypto/rsa.go

@@ -10,7 +10,7 @@ import (
 
 	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 {

p2p/crypto/secio/al.go

@@ -14,7 +14,7 @@ import (
 	"hash"
 
 	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

p2p/crypto/secio/interface.go

@@ -4,11 +4,11 @@ package secio
 import (
 	"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"
 	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.

p2p/crypto/secio/protocol.go

@@ -11,11 +11,11 @@ import (
 
 	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"
-	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"
 	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")

p2p/discovery/mdns.go

@@ -13,9 +13,9 @@ import (
 	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"
 
-	"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"
+	"github.com/ipfs/go-libp2p/p2p/host"
+	"github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 var log = logging.Logger("mdns")

p2p/host/basic/basic_host.go

@@ -6,15 +6,15 @@ import (
 	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"
 	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"
-
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
-	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
-	identify "github.com/ipfs/go-ipfs/p2p/protocol/identify"
-	relay "github.com/ipfs/go-ipfs/p2p/protocol/relay"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
+	mstream "github.com/ipfs/go-libp2p/util/metrics/stream"
+
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	protocol "github.com/ipfs/go-libp2p/p2p/protocol"
+	identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
+	relay "github.com/ipfs/go-libp2p/p2p/protocol/relay"
 )
 
 var log = logging.Logger("p2p/host/basic")

p2p/host/basic/basic_host_test.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"testing"
 
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	protocol "github.com/ipfs/go-ipfs/p2p/protocol"
-	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	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"
 )

p2p/host/basic/natmgr.go

@@ -7,9 +7,9 @@ import (
 	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"
 
-	inat "github.com/ipfs/go-ipfs/p2p/nat"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
+	inat "github.com/ipfs/go-libp2p/p2p/nat"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	lgbl "github.com/ipfs/go-libp2p/util/eventlog/loggables"
 )
 
 // natManager takes care of adding + removing port mappings to the nat.

p2p/host/host.go

@@ -3,11 +3,11 @@ package host
 import (
 	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"
-	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"
+	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")

p2p/host/routed/routed.go

@@ -7,14 +7,14 @@ import (
 	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"
 	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"
+	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")

p2p/net/conn/conn.go

@@ -11,11 +11,11 @@ import (
 	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"
 	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"
-	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")

p2p/net/conn/dial.go

@@ -11,10 +11,10 @@ import (
 	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"
 	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"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 // String returns the string rep of d.

p2p/net/conn/interface.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	filter "github.com/ipfs/go-ipfs/p2p/net/filter"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-libp2p/p2p/crypto"
+	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
 	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"

p2p/net/conn/listen.go

@@ -13,9 +13,9 @@ import (
 	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"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	filter "github.com/ipfs/go-ipfs/p2p/net/filter"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-libp2p/p2p/crypto"
+	filter "github.com/ipfs/go-libp2p/p2p/net/filter"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 // ConnWrapper is any function that wraps a raw multiaddr connection

p2p/net/conn/secure_conn.go

@@ -8,9 +8,9 @@ import (
 	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"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	secio "github.com/ipfs/go-ipfs/p2p/crypto/secio"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-libp2p/p2p/crypto"
+	secio "github.com/ipfs/go-libp2p/p2p/crypto/secio"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 // secureConn wraps another Conn object with an encrypted channel.

p2p/net/conn/secure_conn_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
 	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"
 )

p2p/net/interface.go

@@ -3,8 +3,8 @@ package net
 import (
 	"io"
 
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
 	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"

p2p/net/mock/interface.go

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