Merge pull request #72 from libp2p/dont-use-go-multiaddr-net

stop using the deprecated go-multiaddr-net

README.md

@@ -86,7 +86,7 @@ import (
 
 	ma "github.com/multiformats/go-multiaddr"
 	mafmt "github.com/multiformats/go-multiaddr-fmt"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 	tpt "github.com/libp2p/go-libp2p-core/transport"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 )
@@ -161,13 +161,13 @@ MIT
 The last gx published version of this module was: 0.1.28: QmeqC5shQjEBRG9B8roZqQCJ9xb7Pq6AbWxJFMyLgqBBWh
 
 [tpt]: https://godoc.org/github.com/libp2p/go-libp2p-core/transport
-[manet]: https://github.com/multiformats/go-multiaddr-net
+[manet]: https://github.com/multiformats/go-multiaddr/
 [ss]: https://godoc.org/github.com/libp2p/go-libp2p-core/sec
 [smux]: https://godoc.org/github.com/libp2p/go-libp2p-core/mux
 [pnet]: https://godoc.org/github.com/libp2p/go-libp2p-core/pnet
-[manet-conn]: https://godoc.org/github.com/multiformats/go-multiaddr-net#Conn
-[manet-listener]: https://godoc.org/github.com/multiformats/go-multiaddr-net#Listener
-[maddr-filter]: https://github.com/libp2p/go-maddr-filter
+[manet-conn]: https://godoc.org/github.com/multiformats/go-multiaddr/net#Conn
+[manet-listener]: https://godoc.org/github.com/multiformats/go-multiaddr/net#Listener
+[maddr-filter]: https://github.com/multiformats/go-multiaddr
 [docs-transport]: https://docs.libp2p.io/concepts/transport
 [multiaddr]: https://github.com/multiformats/multiaddr
 [go-libp2p]: https://github.com/lib2p2/go-libp2p

go.mod

@@ -9,6 +9,5 @@ require (
 	github.com/libp2p/go-libp2p-mplex v0.4.1
 	github.com/libp2p/go-libp2p-pnet v0.2.0
 	github.com/multiformats/go-multiaddr v0.3.1
-	github.com/multiformats/go-multiaddr-net v0.2.0
 	github.com/stretchr/testify v1.4.0
 )

listener.go

@@ -5,11 +5,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/libp2p/go-libp2p-core/transport"
-
 	logging "github.com/ipfs/go-log"
 	tec "github.com/jbenet/go-temp-err-catcher"
-	manet "github.com/multiformats/go-multiaddr-net"
+	"github.com/libp2p/go-libp2p-core/transport"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 var log = logging.Logger("stream-upgrader")

listener_test.go

@@ -14,10 +14,9 @@ import (
 	"github.com/libp2p/go-libp2p-core/sec/insecure"
 	"github.com/libp2p/go-libp2p-core/transport"
 
-	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
-
 	st "github.com/libp2p/go-libp2p-transport-upgrader"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr/net"
 
 	"github.com/stretchr/testify/require"
 )

upgrader.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/libp2p/go-libp2p-core/network"
 	"net"
 
 	"github.com/libp2p/go-libp2p-core/connmgr"
 	"github.com/libp2p/go-libp2p-core/mux"
+	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	ipnet "github.com/libp2p/go-libp2p-core/pnet"
 	"github.com/libp2p/go-libp2p-core/sec"
 	"github.com/libp2p/go-libp2p-core/transport"
 	"github.com/libp2p/go-libp2p-pnet"
-
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 // ErrNilPeer is returned when attempting to upgrade an outbound connection

upgrader_test.go

@@ -13,11 +13,11 @@ import (
 
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
-
-	"github.com/stretchr/testify/require"
+	manet "github.com/multiformats/go-multiaddr/net"
 
 	st "github.com/libp2p/go-libp2p-transport-upgrader"
+
+	"github.com/stretchr/testify/require"
 )
 
 var (