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

@@ -1,7 +1,7 @@
 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"
+	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"
-	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"
+	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"
 

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

@@ -1,8 +1,8 @@
 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) {

p2p/net/swarm/swarm_stream.go

@@ -1,7 +1,7 @@
 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

@@ -1,6 +1,6 @@
 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"

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"