From 891e067e60ebee3b77e76e3ee46da34011971703 Mon Sep 17 00:00:00 2001 From: Marco Munizaga Date: Fri, 21 Feb 2025 15:22:41 -0800 Subject: [PATCH 1/2] refactor: Make go-multiaddr v0.15 forward compatible change --- random/random.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/random/random.go b/random/random.go index a677a83..8c84bf4 100644 --- a/random/random.go +++ b/random/random.go @@ -138,15 +138,13 @@ func Multiaddrs(n int) []multiaddr.Multiaddr { return maddrs } +var httpMultiaddrComponent = multiaddr.StringCast("/http") + // HttpMultiaddrs returns a slice of n random unique Multiaddrs. func HttpMultiaddrs(n int) []multiaddr.Multiaddr { maddrs := Multiaddrs(n) - scheme, err := multiaddr.NewComponent("http", "") - if err != nil { - panic(err) - } for i, ma := range maddrs { - maddrs[i] = multiaddr.Join(ma, scheme) + maddrs[i] = multiaddr.Join(ma, httpMultiaddrComponent) } return maddrs } From 181047c73b33d0019c71ad6d8ffaaf84fc4710fc Mon Sep 17 00:00:00 2001 From: Marco Munizaga Date: Fri, 21 Feb 2025 15:26:57 -0800 Subject: [PATCH 2/2] Test with go-multiaddr v0.15 as well --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1108fc0..538ab41 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.23 require ( github.com/ipfs/go-block-format v0.2.0 github.com/ipfs/go-cid v0.5.0 - github.com/libp2p/go-libp2p v0.40.0 - github.com/multiformats/go-multiaddr v0.14.0 + github.com/libp2p/go-libp2p v0.40.1-0.20250221225126-de6c69553d49 + github.com/multiformats/go-multiaddr v0.14.1-0.20250221223610-b38aa8c96e9e github.com/multiformats/go-multicodec v0.9.0 github.com/multiformats/go-multihash v0.2.3 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index e8672f6..a0a58c2 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= -github.com/libp2p/go-libp2p v0.40.0 h1:1LOMO3gigxeXFs50HGEc1U79OINewUQB7o4gTKGPC3U= -github.com/libp2p/go-libp2p v0.40.0/go.mod h1:hOzj2EAIYsXpVpBnyA1pRHzpUJGF9nbWiDLjgasnbF0= +github.com/libp2p/go-libp2p v0.40.1-0.20250221225126-de6c69553d49 h1:ZVBUohVZ+dqG5oLV4CIiVKfoBjgTPKTOm71k1klgnXA= +github.com/libp2p/go-libp2p v0.40.1-0.20250221225126-de6c69553d49/go.mod h1:tsCy8UKO9Qk1k6Uz1m8j6R/Qb9R+wJRdkzDj3CufVMw= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= @@ -37,8 +37,8 @@ github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aG github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= -github.com/multiformats/go-multiaddr v0.14.0 h1:bfrHrJhrRuh/NXH5mCnemjpbGjzRw/b+tJFOD41g2tU= -github.com/multiformats/go-multiaddr v0.14.0/go.mod h1:6EkVAxtznq2yC3QT5CM1UTAwG0GTP3EWAIcjHuzQ+r4= +github.com/multiformats/go-multiaddr v0.14.1-0.20250221223610-b38aa8c96e9e h1:D5PHaPp581wvQbZcpqicHtG6StyfCfpisSvH5meEzGY= +github.com/multiformats/go-multiaddr v0.14.1-0.20250221223610-b38aa8c96e9e/go.mod h1:JSVUmXDjsVFiW7RjIFMP7+Ev+h1DTbiJgVeTV/tcmP0= github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=