rewrote imports to p2p

p2p/net/mock/mock_conn.go

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

p2p/net/mock/mock_link.go

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

p2p/net/mock/mock_net.go

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

p2p/net/mock/mock_notif_test.go

@@ -6,8 +6,8 @@ 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"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 func TestNotifications(t *testing.T) {

p2p/net/mock/mock_peernet.go

@@ -5,8 +5,8 @@ import (
 	"math/rand"
 	"sync"
 
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	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/mock_printer.go

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

p2p/net/mock/mock_stream.go

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

p2p/net/mock/mock_test.go

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

p2p/net/swarm/dial_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	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"
 
 	testutil "github.com/ipfs/go-ipfs/util/testutil"
 	ci "github.com/ipfs/go-ipfs/util/testutil/ci"

p2p/net/swarm/peers_test.go

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

p2p/net/swarm/simul_test.go

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

p2p/net/swarm/swarm.go

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

p2p/net/swarm/swarm_addr.go

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

p2p/net/swarm/swarm_addr_test.go

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

p2p/net/swarm/swarm_conn.go

@@ -3,10 +3,10 @@ package swarm
 import (
 	"fmt"
 
-	ic "github.com/ipfs/go-ipfs/p2p/crypto"
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	conn "github.com/ipfs/go-ipfs/p2p/net/conn"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	ic "github.com/ipfs/go-libp2p/p2p/crypto"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	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"
 	ps "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"

p2p/net/swarm/swarm_dial.go

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

p2p/net/swarm/swarm_listen.go

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

p2p/net/swarm/swarm_net.go

@@ -3,10 +3,10 @@ package swarm
 import (
 	"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-ipfs/p2p/net"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	metrics "github.com/ipfs/go-libp2p/util/metrics"
 
 	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/swarm/swarm_net_test.go

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

p2p/net/swarm/swarm_notif_test.go

@@ -7,8 +7,8 @@ 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"
 
-	inet "github.com/ipfs/go-ipfs/p2p/net"
-	peer "github.com/ipfs/go-ipfs/p2p/peer"
+	inet "github.com/ipfs/go-libp2p/p2p/net"
+	peer "github.com/ipfs/go-libp2p/p2p/peer"
 )
 
 func TestNotifications(t *testing.T) {