rewrote imports to p2p

p2p/test/reconnects/reconnect_test.go

@@ -7,13 +7,13 @@ import (
 	"testing"
 	"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"
+	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"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"

p2p/test/util/key.go

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

p2p/test/util/util.go

@@ -3,12 +3,12 @@ package testutil
 import (
 	"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"
+	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"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"