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

bot: Bump github.com/ipfs/go-cid from 0.3.2 to 0.4.0 #1200

Merged
merged 4 commits into from
Mar 20, 2023
Merged

bot: Bump github.com/ipfs/go-cid from 0.3.2 to 0.4.0 #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cdde02
bot: Bump github.com/ipfs/go-cid from 0.3.2 to 0.4.0
dependabot[bot] Mar 20, 2023
078ba56
fix: handle the changes in errors
orpheuslummis Mar 20, 2023
56b75da
simplify error message
orpheuslummis Mar 20, 2023
e54eb59
oops 1 line was missing in previous commit
orpheuslummis Mar 20, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/graphql-go/graphql v0.8.0
github.com/iancoleman/strcase v0.2.0
github.com/ipfs/go-blockservice v0.5.0
github.com/ipfs/go-cid v0.3.2
github.com/ipfs/go-cid v0.4.0
github.com/ipfs/go-datastore v0.6.0
github.com/ipfs/go-ipfs-blockstore v1.3.0
github.com/ipfs/go-ipfs-ds-help v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj
github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
github.com/ipfs/go-cid v0.0.6/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
github.com/ipfs/go-cid v0.3.2 h1:OGgOd+JCFM+y1DjWPmVH+2/4POtpDzwcr7VgnB7mZXc=
github.com/ipfs/go-cid v0.3.2/go.mod h1:gQ8pKqT/sUxGY+tIwy1RPpAojYu7jAyCp5Tz1svoupw=
github.com/ipfs/go-cid v0.4.0 h1:a4pdZq0sx6ZSxbCizebnKiMCx/xI/aBBFlB73IgH4rA=
github.com/ipfs/go-cid v0.4.0/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
github.com/ipfs/go-cidutil v0.1.0 h1:RW5hO7Vcf16dplUU60Hs0AKDkQAVPVplr7lk97CFL+Q=
github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
github.com/ipfs/go-datastore v0.0.5/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
Expand Down
6 changes: 1 addition & 5 deletions planner/select.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/sourcenetwork/defradb/core"
"github.com/sourcenetwork/defradb/db/base"
"github.com/sourcenetwork/defradb/db/fetcher"
"github.com/sourcenetwork/defradb/errors"
"github.com/sourcenetwork/defradb/planner/mapper"
)

Expand Down Expand Up @@ -224,10 +223,7 @@ func (n *selectNode) initSource() ([]aggregateNode, error) {
if n.parsed.Cid.HasValue() {
c, err := cid.Decode(n.parsed.Cid.Value())
if err != nil {
return nil, errors.Wrap(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: Thanks for removing this :)

"failed to propagate VersionFetcher span, invalid CID",
err,
)
return nil, err
}
spans := fetcher.NewVersionedSpan(
core.DataStoreKey{DocKey: n.parsed.DocKeys.Value()[0]},
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/query/simple/with_cid_dockey_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestQuerySimpleWithInvalidCidAndInvalidDocKey(t *testing.T) {
}`,
},
},
ExpectedError: "invalid CID",
ExpectedError: "invalid cid: selected encoding not supported",
}

executeTestCase(t, test)
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/query/simple/with_cid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestQuerySimpleWithInvalidCid(t *testing.T) {
}`,
},
},
ExpectedError: "failed to propagate VersionFetcher span, invalid CID: selected encoding not supported",
ExpectedError: "invalid cid: selected encoding not supported",
}

executeTestCase(t, test)
Expand Down