update go-multiaddr for go-multiaddr-net merge

libp2p · Aug 19, 2020 · a8fad0c · a8fad0c
1 parent d936acb
commit a8fad0c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/daemon.go b/daemon.go
@@ -21,7 +21,7 @@ import (
 	dhtopts "github.com/libp2p/go-libp2p-kad-dht/opts"
 	ps "github.com/libp2p/go-libp2p-pubsub"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 var log = logging.Logger("p2pd")

diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/libp2p/go-libp2p-secio v0.2.2
 	github.com/libp2p/go-libp2p-tls v0.1.3
 	github.com/multiformats/go-multiaddr v0.3.0
-	github.com/multiformats/go-multiaddr-net v0.2.0
+	github.com/multiformats/go-multiaddr-net v0.2.0 // indirect
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/prometheus/client_golang v1.7.1
 	github.com/stretchr/testify v1.6.1

diff --git a/p2pclient/p2pclient.go b/p2pclient/p2pclient.go
@@ -10,7 +10,7 @@ import (
 	logging "github.com/ipfs/go-log"
 	pb "github.com/libp2p/go-libp2p-daemon/pb"
 	multiaddr "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 var log = logging.Logger("p2pclient")

diff --git a/p2pclient/streams.go b/p2pclient/streams.go
@@ -13,7 +13,7 @@ import (
 	proto "github.com/gogo/protobuf/proto"
 	pb "github.com/libp2p/go-libp2p-daemon/pb"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 // StreamInfo wraps the protobuf structure with friendlier types.

diff --git a/stream.go b/stream.go
@@ -8,7 +8,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/network"
 
 	ggio "github.com/gogo/protobuf/io"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 func (d *Daemon) doStreamPipe(c net.Conn, s network.Stream) {

diff --git a/test/mock_daemon.go b/test/mock_daemon.go
@@ -10,7 +10,7 @@ import (
 	"github.com/libp2p/go-libp2p-daemon/p2pclient"
 	pb "github.com/libp2p/go-libp2p-daemon/pb"
 	ma "github.com/multiformats/go-multiaddr"
-	manet "github.com/multiformats/go-multiaddr-net"
+	manet "github.com/multiformats/go-multiaddr/net"
 )
 
 type mockDaemon struct {