Skip to content

Commit 664ed46

Browse files
marten-seemannmarten-seemann
authored
Merge pull request #1279 from libp2p/remove-addrutil
remove direct dependency on libp2p/go-addr-util
2 parents e144423 + 161f1c7 commit 664ed46

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

‎examples/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/libp2p/go-libp2p-noise v0.3.0
1616
github.com/libp2p/go-libp2p-swarm v0.9.0
1717
github.com/libp2p/go-libp2p-tls v0.3.1
18-
github.com/multiformats/go-multiaddr v0.4.0
18+
github.com/multiformats/go-multiaddr v0.5.0
1919
)
2020

2121
// Ensure that examples always use the go-libp2p version in the same git checkout.

‎examples/go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,9 @@ github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u
665665
github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
666666
github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
667667
github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
668-
github.com/multiformats/go-multiaddr v0.4.0 h1:hL/K4ZJhJ5PTw3nwylq9lGU5yArzcAroZmex1ghSEkQ=
669668
github.com/multiformats/go-multiaddr v0.4.0/go.mod h1:YcpyLH8ZPudLxQlemYBPhSm0/oCXAT8Z4mzFpyoPyRc=
669+
github.com/multiformats/go-multiaddr v0.5.0 h1:i/JuOoVg4szYQ4YEzDGtb2h0o8M7CG/Yq6cGlcjWZpM=
670+
github.com/multiformats/go-multiaddr v0.5.0/go.mod h1:3KAxNkUqLTJ20AAwN4XVX4kZar+bR+gh4zgbfr3SNug=
670671
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
671672
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
672673
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

‎examples/ipfs-camp-2019/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/libp2p/go-libp2p-yamux v0.7.0
1515
github.com/libp2p/go-tcp-transport v0.4.0
1616
github.com/libp2p/go-ws-transport v0.5.0
17-
github.com/multiformats/go-multiaddr v0.4.0
17+
github.com/multiformats/go-multiaddr v0.5.0
1818
)
1919

2020
// Ensure that examples always use the go-libp2p version in the same git checkout.

‎examples/ipfs-camp-2019/go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,9 @@ github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u
674674
github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
675675
github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
676676
github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
677-
github.com/multiformats/go-multiaddr v0.4.0 h1:hL/K4ZJhJ5PTw3nwylq9lGU5yArzcAroZmex1ghSEkQ=
678677
github.com/multiformats/go-multiaddr v0.4.0/go.mod h1:YcpyLH8ZPudLxQlemYBPhSm0/oCXAT8Z4mzFpyoPyRc=
678+
github.com/multiformats/go-multiaddr v0.5.0 h1:i/JuOoVg4szYQ4YEzDGtb2h0o8M7CG/Yq6cGlcjWZpM=
679+
github.com/multiformats/go-multiaddr v0.5.0/go.mod h1:3KAxNkUqLTJ20AAwN4XVX4kZar+bR+gh4zgbfr3SNug=
679680
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
680681
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
681682
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

‎examples/pubsub/chat/go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,9 @@ github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u
623623
github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
624624
github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
625625
github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
626-
github.com/multiformats/go-multiaddr v0.4.0 h1:hL/K4ZJhJ5PTw3nwylq9lGU5yArzcAroZmex1ghSEkQ=
627626
github.com/multiformats/go-multiaddr v0.4.0/go.mod h1:YcpyLH8ZPudLxQlemYBPhSm0/oCXAT8Z4mzFpyoPyRc=
627+
github.com/multiformats/go-multiaddr v0.5.0 h1:i/JuOoVg4szYQ4YEzDGtb2h0o8M7CG/Yq6cGlcjWZpM=
628+
github.com/multiformats/go-multiaddr v0.5.0/go.mod h1:3KAxNkUqLTJ20AAwN4XVX4kZar+bR+gh4zgbfr3SNug=
628629
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
629630
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
630631
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

‎go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/ipfs/go-log/v2 v2.4.0
1616
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
1717
github.com/koron/go-ssdp v0.0.2 // indirect
18-
github.com/libp2p/go-addr-util v0.1.0
1918
github.com/libp2p/go-buffer-pool v0.0.2
2019
github.com/libp2p/go-conn-security-multistream v0.3.0
2120
github.com/libp2p/go-eventbus v0.2.1
@@ -41,7 +40,7 @@ require (
4140
github.com/libp2p/go-tcp-transport v0.4.0
4241
github.com/libp2p/go-ws-transport v0.5.0
4342
github.com/libp2p/zeroconf/v2 v2.1.1
44-
github.com/multiformats/go-multiaddr v0.4.0
43+
github.com/multiformats/go-multiaddr v0.5.0
4544
github.com/multiformats/go-multiaddr-dns v0.3.1
4645
github.com/multiformats/go-multistream v0.2.2
4746
github.com/multiformats/go-varint v0.0.6

‎go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,9 @@ github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u
608608
github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
609609
github.com/multiformats/go-multiaddr v0.3.1/go.mod h1:uPbspcUPd5AfaP6ql3ujFY+QWzmBD8uLLL4bXW0XfGc=
610610
github.com/multiformats/go-multiaddr v0.3.3/go.mod h1:lCKNGP1EQ1eZ35Za2wlqnabm9xQkib3fyB+nZXHLag0=
611-
github.com/multiformats/go-multiaddr v0.4.0 h1:hL/K4ZJhJ5PTw3nwylq9lGU5yArzcAroZmex1ghSEkQ=
612611
github.com/multiformats/go-multiaddr v0.4.0/go.mod h1:YcpyLH8ZPudLxQlemYBPhSm0/oCXAT8Z4mzFpyoPyRc=
612+
github.com/multiformats/go-multiaddr v0.5.0 h1:i/JuOoVg4szYQ4YEzDGtb2h0o8M7CG/Yq6cGlcjWZpM=
613+
github.com/multiformats/go-multiaddr v0.5.0/go.mod h1:3KAxNkUqLTJ20AAwN4XVX4kZar+bR+gh4zgbfr3SNug=
613614
github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
614615
github.com/multiformats/go-multiaddr-dns v0.3.1/go.mod h1:G/245BRQ6FJGmryJCrOuTdB37AMA5AMOVuO6NY3JwTk=
615616
github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

‎p2p/host/basic/basic_host.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync"
1010
"time"
1111

12-
autonat "github.com/libp2p/go-libp2p/p2p/host/autonat"
12+
"github.com/libp2p/go-libp2p/p2p/host/autonat"
1313
"github.com/libp2p/go-libp2p/p2p/host/pstoremanager"
1414
"github.com/libp2p/go-libp2p/p2p/host/relaysvc"
1515
relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
@@ -27,7 +27,6 @@ import (
2727
"github.com/libp2p/go-libp2p-core/protocol"
2828
"github.com/libp2p/go-libp2p-core/record"
2929

30-
addrutil "github.com/libp2p/go-addr-util"
3130
"github.com/libp2p/go-eventbus"
3231
inat "github.com/libp2p/go-libp2p-nat"
3332
"github.com/libp2p/go-netroute"
@@ -826,7 +825,7 @@ func (h *BasicHost) AllAddrs() []ma.Multiaddr {
826825
// Iterate over all _unresolved_ listen addresses, resolving our primary
827826
// interface only to avoid advertising too many addresses.
828827
var finalAddrs []ma.Multiaddr
829-
if resolved, err := addrutil.ResolveUnspecifiedAddresses(listenAddrs, filteredIfaceAddrs); err != nil {
828+
if resolved, err := manet.ResolveUnspecifiedAddresses(listenAddrs, filteredIfaceAddrs); err != nil {
830829
// This can happen if we're listening on no addrs, or listening
831830
// on IPv6 addrs, but only have IPv4 interface addrs.
832831
log.Debugw("failed to resolve listen addrs", "error", err)
@@ -959,7 +958,7 @@ func (h *BasicHost) AllAddrs() []ma.Multiaddr {
959958
// No.
960959
// in case the router gives us a wrong address or we're behind a double-NAT.
961960
// also add observed addresses
962-
resolved, err := addrutil.ResolveUnspecifiedAddress(listen, allIfaceAddrs)
961+
resolved, err := manet.ResolveUnspecifiedAddress(listen, allIfaceAddrs)
963962
if err != nil {
964963
// This can happen if we try to resolve /ip6/::/...
965964
// without any IPv6 interface addresses.

0 commit comments

Comments
 (0)