Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add peerID to multiaddresses returned by boost provider retrieval-transports query #1568

Merged
merged 3 commits into from
Jul 18, 2023
Merged

add peerID to multiaddresses returned by boost provider retrieval-transports query #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
266ac33
add peerID to multiaddress
Jul 13, 2023
28a0709
fix error typos
Jul 13, 2023
3fce9c0
undo http-libp2p on vanilla http
Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/boost/provider_cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package main

import (
"testing"

"github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"
"testing"
)

func TestMultiaddrToNative(t *testing.T) {
Expand Down
19 changes: 16 additions & 3 deletions node/modules/retrieval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,14 @@ import (
func bitswapMultiAddrs(cfg *config.Boost, h host.Host) ([]multiaddr.Multiaddr, error) {
// if BitswapPublicAddresses is empty, that means we'll be serving bitswap directly from this host, so just return host multiaddresses
if len(cfg.Dealmaking.BitswapPublicAddresses) == 0 {
return h.Addrs(), nil
maddr, err := peer.AddrInfoToP2pAddrs(&peer.AddrInfo{
ID: h.ID(),
Addrs: h.Addrs(),
})
if err != nil {
return nil, fmt.Errorf("could not parse bitswap addresses: %w", err)
}
return maddr, nil
}

// otherwise bitswap protocols are exposed publicly directly from booster bitswap.
Expand Down Expand Up @@ -63,9 +70,16 @@ func NewTransportsListener(cfg *config.Boost) func(h host.Host) (*lp2pimpl.Trans

// Get the libp2p addresses from the Host
if len(h.Addrs()) > 0 {
maddr, err := peer.AddrInfoToP2pAddrs(&peer.AddrInfo{
ID: h.ID(),
Addrs: h.Addrs(),
})
if err != nil {
return nil, fmt.Errorf("could not parse libp2p addresses: %w", err)
}
protos = append(protos, types.Protocol{
Name: "libp2p",
Addresses: h.Addrs(),
Addresses: maddr,
})
}

Expand All @@ -78,7 +92,6 @@ func NewTransportsListener(cfg *config.Boost) func(h host.Host) (*lp2pimpl.Trans
msg += "Could not parse '%s' as multiaddr: %w"
return nil, fmt.Errorf(msg, cfg.Dealmaking.HTTPRetrievalMultiaddr, err)
}

protos = append(protos, types.Protocol{
Name: "http",
Addresses: []multiaddr.Multiaddr{maddr},
Expand Down