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

fix two small nits in the go-ipfs constructor #6234

Merged
merged 2 commits into from
Apr 18, 2019
Merged

fix two small nits in the go-ipfs constructor #6234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2611d4
chore: avoid converting addresses to human readable strings
Stebalien Apr 18, 2019
d83374f
fix: handle peerstore failure case in constructor
Stebalien Apr 18, 2019
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
16 changes: 10 additions & 6 deletions core/node/libp2p.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,19 @@ var DHTOption RoutingOption = constructDHTRouting
var DHTClientOption RoutingOption = constructClientDHTRouting
var NilRouterOption RoutingOption = nilrouting.ConstructNilRouting

func Peerstore(id peer.ID, sk crypto.PrivKey) peerstore.Peerstore {
func Peerstore(id peer.ID, sk crypto.PrivKey) (peerstore.Peerstore, error) {
ps := pstoremem.NewPeerstore()

if sk != nil {
ps.AddPrivKey(id, sk)
ps.AddPubKey(id, sk.GetPublic())
if err := ps.AddPubKey(id, sk.GetPublic()); err != nil {
return nil, err
}
if err := ps.AddPrivKey(id, sk); err != nil {
return nil, err
}
}

return ps
return ps, nil
}

func P2PAddrFilters(cfg *config.Config) (opts Libp2pOpts, err error) {
Expand Down Expand Up @@ -198,7 +202,7 @@ func makeAddrsFactory(cfg config.Addresses) (p2pbhost.AddrsFactory, error) {
if err != nil {
return nil, err
}
noAnnAddrs[maddr.String()] = true
noAnnAddrs[string(maddr.Bytes())] = true
}

return func(allAddrs []ma.Multiaddr) []ma.Multiaddr {
Expand All @@ -212,7 +216,7 @@ func makeAddrsFactory(cfg config.Addresses) (p2pbhost.AddrsFactory, error) {
var out []ma.Multiaddr
for _, maddr := range addrs {
// check for exact matches
ok := noAnnAddrs[maddr.String()]
ok := noAnnAddrs[string(maddr.Bytes())]
// check for /ipcidr matches
if !ok && !filters.AddrBlocked(maddr) {
out = append(out, maddr)
Expand Down