Skip to content

Fix infinite recursive call in registry. Fix libp2p/core import path. #137

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

Merged
lthibault merged 3 commits into from
Jul 27, 2023
Merged

Fix infinite recursive call in registry. Fix libp2p/core import path. #137

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
7e5b894
Fix infinite recursive call in registry. Fix libp2p/core import path.
lthibault Jul 27, 2023
2e48761
Fix libp2p/core import path in registry command.
lthibault Jul 27, 2023
d1e3181
Remove deprecated libp2p-core package from go.sum.
lthibault Jul 27, 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
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ require (
github.com/ipfs/go-cid v0.4.1
github.com/ipfs/go-datastore v0.6.0
github.com/ipfs/go-ds-badger2 v0.1.3
github.com/libp2p/go-libp2p-core v0.20.1
github.com/lthibault/go-libp2p-inproc-transport v0.4.0
github.com/multiformats/go-multistream v0.4.1
github.com/stealthrocket/wazergo v0.19.1
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ github.com/libp2p/go-libp2p v0.29.0 h1:QduJ2XQr/Crg4EnloueWDL0Jj86N3Ezhyyj7XH+Xw
github.com/libp2p/go-libp2p v0.29.0/go.mod h1:iNKL7mEnZ9wAss+03IjAwM9ZAQXfVUAPUUmOACQfQ/g=
github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
github.com/libp2p/go-libp2p-core v0.20.1 h1:fQz4BJyIFmSZAiTbKV8qoYhEH5Dtv/cVhZbG3Ib/+Cw=
github.com/libp2p/go-libp2p-core v0.20.1/go.mod h1:6zR8H7CvQWgYLsbG4on6oLNSGcyKaYFSEYyDt51+bIY=
github.com/libp2p/go-libp2p-kad-dht v0.24.2 h1:zd7myKBKCmtZBhI3I0zm8xBkb28v3gmSEtQfBdAdFwc=
github.com/libp2p/go-libp2p-kad-dht v0.24.2/go.mod h1:BShPzRbK6+fN3hk8a0WGAYKpb8m4k+DtchkqouGTrSg=
github.com/libp2p/go-libp2p-kbucket v0.6.3 h1:p507271wWzpy2f1XxPzCQG9NiN6R6lHL9GiSErbQQo0=
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/cluster/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/hex"
"fmt"

p2pRec "github.com/libp2p/go-libp2p-core/record"
"github.com/libp2p/go-libp2p/core/crypto"
p2pRec "github.com/libp2p/go-libp2p/core/record"
ma "github.com/multiformats/go-multiaddr"
"github.com/urfave/cli/v2"
service "github.com/wetware/ww/pkg/registry"
Expand Down Expand Up @@ -73,7 +73,7 @@ func locAction() cli.ActionFunc {

for loc, ok := locs.Next(); ok; loc, ok = locs.Next() {
m, err := loc.Maddrs()
if err != nil{
if err != nil {
return fmt.Errorf("failed to get maddrs from location: %w", err)
}
fmt.Println(m)
Expand Down
2 changes: 1 addition & 1 deletion pkg/registry/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-core/record"
pubsub "github.com/libp2p/go-libp2p-pubsub"
"github.com/libp2p/go-libp2p/core/crypto"
"github.com/libp2p/go-libp2p/core/host"
"github.com/libp2p/go-libp2p/core/record"
inproc "github.com/lthibault/go-libp2p-inproc-transport"
ma "github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions pkg/registry/structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"capnproto.org/go/capnp/v3"
"github.com/libp2p/go-libp2p-core/record"
"github.com/libp2p/go-libp2p/core/record"
ma "github.com/multiformats/go-multiaddr"
api "github.com/wetware/ww/api/registry"
)
Expand Down Expand Up @@ -67,14 +67,14 @@ func (loc Location) SetMaddrs(maddrs []ma.Multiaddr) error {
}

func (loc Location) SetAnchor(anchor string) error {
if err := loc.SetAnchor(anchor); err != nil {
if err := loc.Location.SetAnchor(anchor); err != nil {
return fmt.Errorf("fail to set anchor in capnp Location: %w", err)
}
return nil
}

func (loc Location) SetCustom(custom capnp.Ptr) error {
if err := loc.SetCustom(custom); err != nil {
if err := loc.Location.SetCustom(custom); err != nil {
return fmt.Errorf("fail to set custom in capnp Location: %w", err)
}
return nil
Expand Down