Merge pull request #132 from libp2p/feat/update-deps-2

update deps

examples/hosts/main.go

@@ -14,10 +14,10 @@ import (
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	swarm "github.com/libp2p/go-libp2p/p2p/net/swarm"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	testutil "github.com/libp2p/go-testutil"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // create a 'Host' with a random peer to listen on the given address

examples/justtcp/main.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	ma "github.com/jbenet/go-multiaddr"
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
 	tcpt "github.com/libp2p/go-tcp-transport"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func fatal(i interface{}) {

p2p/discovery/mdns.go

@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
 	"github.com/libp2p/go-libp2p-host"
+	"github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 	"github.com/whyrusleeping/mdns"
 )
 

p2p/discovery/mdns_test.go

@@ -8,7 +8,7 @@ import (
 	host "github.com/libp2p/go-libp2p-host"
 	netutil "github.com/libp2p/go-libp2p/p2p/test/util"
 
-	pstore "github.com/ipfs/go-libp2p-peerstore"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 )
 
 type DiscoveryNotifee struct {

p2p/host/basic/basic_host.go

@@ -8,15 +8,15 @@ import (
 	identify "github.com/libp2p/go-libp2p/p2p/protocol/identify"
 	relay "github.com/libp2p/go-libp2p/p2p/protocol/relay"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
-	ma "github.com/jbenet/go-multiaddr"
 	goprocess "github.com/jbenet/goprocess"
 	metrics "github.com/libp2p/go-libp2p-metrics"
 	mstream "github.com/libp2p/go-libp2p-metrics/stream"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	protocol "github.com/libp2p/go-libp2p-protocol"
+	ma "github.com/multiformats/go-multiaddr"
 
 	msmux "github.com/whyrusleeping/go-multistream"
 )

p2p/host/basic/natmgr.go

@@ -6,10 +6,10 @@ import (
 
 	inat "github.com/libp2p/go-libp2p/p2p/nat"
 
-	lgbl "github.com/ipfs/go-libp2p-loggables"
-	ma "github.com/jbenet/go-multiaddr"
 	goprocess "github.com/jbenet/goprocess"
+	lgbl "github.com/libp2p/go-libp2p-loggables"
 	inet "github.com/libp2p/go-libp2p-net"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // natManager takes care of adding + removing port mappings to the nat.

p2p/host/routed/routed.go

@@ -7,14 +7,14 @@ import (
 
 	host "github.com/libp2p/go-libp2p-host"
 
-	lgbl "github.com/ipfs/go-libp2p-loggables"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
 	logging "github.com/ipfs/go-log"
-	ma "github.com/jbenet/go-multiaddr"
+	lgbl "github.com/libp2p/go-libp2p-loggables"
 	metrics "github.com/libp2p/go-libp2p-metrics"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	protocol "github.com/libp2p/go-libp2p-protocol"
+	ma "github.com/multiformats/go-multiaddr"
 	msmux "github.com/whyrusleeping/go-multistream"
 )
 

p2p/nat/mapping.go

@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
 	"github.com/jbenet/goprocess"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 )
 
 // Mapping represents a port mapping in a NAT.

p2p/nat/nat.go

@@ -10,10 +10,10 @@ import (
 
 	nat "github.com/fd/go-nat"
 	logging "github.com/ipfs/go-log"
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
 	goprocess "github.com/jbenet/goprocess"
 	periodic "github.com/jbenet/goprocess/periodic"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 )
 
 var (

p2p/net/mock/interface.go

@@ -12,11 +12,11 @@ import (
 
 	host "github.com/libp2p/go-libp2p-host"
 
-	ic "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
+	ic "github.com/libp2p/go-libp2p-crypto"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 type Mocknet interface {

p2p/net/mock/mock_conn.go

@@ -4,11 +4,11 @@ import (
 	"container/list"
 	"sync"
 
-	ic "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
 	process "github.com/jbenet/goprocess"
+	ic "github.com/libp2p/go-libp2p-crypto"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // conn represents one side's perspective of a

p2p/net/mock/mock_link.go

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

p2p/net/mock/mock_net.go

@@ -10,14 +10,14 @@ import (
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	p2putil "github.com/libp2p/go-libp2p/p2p/test/util"
 
-	ic "github.com/ipfs/go-libp2p-crypto"
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
+	ic "github.com/libp2p/go-libp2p-crypto"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	testutil "github.com/libp2p/go-testutil"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // mocknet implements mocknet.Mocknet

p2p/net/mock/mock_notif_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	ma "github.com/jbenet/go-multiaddr"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestNotifications(t *testing.T) {

p2p/net/mock/mock_peernet.go

@@ -6,12 +6,12 @@ import (
 	"math/rand"
 	"sync"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
 	goprocessctx "github.com/jbenet/goprocess/context"
 	inet "github.com/libp2p/go-libp2p-net"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // peernet implements inet.Network

p2p/net/mock/mock_printer.go

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

p2p/net/mock/mock_test.go

@@ -12,8 +12,8 @@ import (
 
 	inet "github.com/libp2p/go-libp2p-net"
 
-	peer "github.com/ipfs/go-libp2p-peer"
 	detectrace "github.com/jbenet/go-detect-race"
+	peer "github.com/libp2p/go-libp2p-peer"
 	protocol "github.com/libp2p/go-libp2p-protocol"
 	testutil "github.com/libp2p/go-testutil"
 )

p2p/net/swarm/dial_sync.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	peer "github.com/ipfs/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 type DialFunc func(context.Context, peer.ID) (*Conn, error)

p2p/net/swarm/dial_sync_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p-peer"
+	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 func getMockDialFunc() (DialFunc, func(), context.Context, <-chan struct{}) {

p2p/net/swarm/dial_test.go

@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	peer "github.com/ipfs/go-libp2p-peer"
-	pstore "github.com/ipfs/go-libp2p-peerstore"
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
 	addrutil "github.com/libp2p/go-addr-util"
+	peer "github.com/libp2p/go-libp2p-peer"
+	pstore "github.com/libp2p/go-libp2p-peerstore"
 	testutil "github.com/libp2p/go-testutil"
 	ci "github.com/libp2p/go-testutil/ci"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 )
 
 func closeSwarms(swarms []*Swarm) {