rewrote imports to p2p

p2p/net/swarm/swarm_stream.go

 package swarm
 
 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"
 )

p2p/net/swarm/swarm_test.go

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

p2p/peer/metrics_test.go

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

p2p/peer/peer.go

@@ -11,9 +11,9 @@ import (
 	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"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
 	u "github.com/ipfs/go-ipfs/util"
 	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")

p2p/peer/peer_test.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"testing"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	. "github.com/ipfs/go-ipfs/p2p/peer"
 	u "github.com/ipfs/go-ipfs/util"
 	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"
 )

p2p/peer/peerstore.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"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"
 	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"

p2p/peer/queue/distance.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
 	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.

p2p/peer/queue/interface.go

 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.
 // Implementations of PeerQueue could order peers based on distances along

p2p/peer/queue/queue_test.go

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

p2p/peer/queue/sync.go

@@ -2,8 +2,8 @@ package queue
 
 import (
 	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"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 var log = logging.Logger("peerqueue")

p2p/protocol/identify/id.go

@@ -9,15 +9,15 @@ 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"
 
-	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"
 	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")

p2p/protocol/identify/id_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
-	host "github.com/ipfs/go-ipfs/p2p/host"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
-	identify "github.com/ipfs/go-ipfs/p2p/protocol/identify"
-	testutil "github.com/ipfs/go-ipfs/p2p/test/util"
+	host "github.com/ipfs/go-libp2p/p2p/host"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
+	identify "github.com/ipfs/go-libp2p/p2p/protocol/identify"
+	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 
 	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"

p2p/protocol/identify/obsaddr.go

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

p2p/protocol/mux.go

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

p2p/protocol/mux_test.go

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

p2p/protocol/ping/ping.go

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

p2p/protocol/ping/ping_test.go

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

p2p/protocol/relay/relay.go

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

p2p/protocol/relay/relay_test.go

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

p2p/test/backpressure/backpressure_test.go

@@ -6,12 +6,12 @@ import (
 	"testing"
 	"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"
+	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"
 	u "github.com/ipfs/go-ipfs/util"