Skip to content

fix: gateway/blocks-backend: GetBlock should not perform IPLD decoding #845

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
merged 3 commits into from
Feb 18, 2025
Merged

fix: gateway/blocks-backend: GetBlock should not perform IPLD decoding #845

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a33795b
gateway/blocks-backend: GetBlock should not perform IPLD decoding #673
gsergey418 Feb 14, 2025
b76f2d0
Add changelog entry.
gsergey418 Feb 14, 2025
9b0b75c
Merge branch 'main' into fix/673-getblock-no-ipld-decode
gammazero Feb 18, 2025
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
Next Next commit
gateway/blocks-backend: GetBlock should not perform IPLD decoding #673
  • Loading branch information
@gsergey418
gsergey418 committed Feb 14, 2025
commit a33795b39fa2166ec92df61cf51a9aa3a61d6697
18 changes: 16 additions & 2 deletions gateway/backend_blocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"github.com/ipld/go-car/v2/storage"
dagpb "github.com/ipld/go-codec-dagpb"
"github.com/ipld/go-ipld-prime"

// Ensure basic codecs are registered.
_ "github.com/ipld/go-ipld-prime/codec/cbor"
_ "github.com/ipld/go-ipld-prime/codec/dagcbor"
Expand Down Expand Up @@ -210,12 +211,25 @@
}

func (bb *BlocksBackend) GetBlock(ctx context.Context, path path.ImmutablePath) (ContentPathMetadata, files.File, error) {
md, nd, err := bb.getNode(ctx, path)
roots, lastSeg, remainder, err := bb.getPathRoots(ctx, path)
if err != nil {
return ContentPathMetadata{}, nil, err
}

Check warning on line 217 in gateway/backend_blocks.go

View check run for this annotation

Codecov / codecov/patch

gateway/backend_blocks.go#L216-L217 

Added lines #L216 - L217 were not covered by tests

md := ContentPathMetadata{
PathSegmentRoots: roots,
LastSegment: lastSeg,
LastSegmentRemainder: remainder,
}

lastRoot := lastSeg.RootCid()

b, err := bb.blockService.GetBlock(ctx, lastRoot)
if err != nil {
return md, nil, err
}

return md, files.NewBytesFile(nd.RawData()), nil
return md, files.NewBytesFile(b.RawData()), nil
}

func (bb *BlocksBackend) Head(ctx context.Context, path path.ImmutablePath) (ContentPathMetadata, *HeadResponse, error) {
Expand Down
Loading