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

misc(blob/service)!: return empty values in case blobs were not found #3223

Merged
merged 10 commits into from
Jul 4, 2024
Merged

misc(blob/service)!: return empty values in case blobs were not found #3223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
867a11f
return empty slice and an error if blobs were not found
vgonkivs Mar 1, 2024
f548d25
chore: rework returned values
vgonkivs Mar 7, 2024
228dd53
chore: return empty result and error when blobs were not found
vgonkivs May 10, 2024
eb6991b
extend test case
vgonkivs May 10, 2024
4b88424
add comment
vgonkivs May 13, 2024
734d185
fix nits
vgonkivs May 13, 2024
a9398b7
improvements
vgonkivs Jul 3, 2024
9d73b73
improve tests
vgonkivs Jul 3, 2024
fb043fa
fix nits
vgonkivs Jul 3, 2024
bc24637
Merge branch 'main' into fix_get_all
vgonkivs Jul 4, 2024
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: 6 additions & 10 deletions blob/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,14 @@ func (s *Service) GetAll(ctx context.Context, height uint64, namespaces []share.
defer wg.Done()

blobs, err := s.getBlobs(ctx, namespace, header)
switch {
case err == nil:
log.Infow("retrieved blobs", "height", height, "total", len(blobs))
resultBlobs[i] = blobs
case errors.Is(err, ErrBlobNotFound):
default:
if err != nil && !errors.Is(err, ErrBlobNotFound) {
log.Debugf("getting blobs for namespace(%s): %v", namespace.String(), err)
vgonkivs marked this conversation as resolved.
Show resolved Hide resolved
resultErr[i] = err
vgonkivs marked this conversation as resolved.
Show resolved Hide resolved
}
if len(blobs) > 0 {
log.Infow("retrieved blobs", "height", height, "total", len(blobs))
resultBlobs[i] = blobs
}
}(i, namespace)
}
wg.Wait()
Expand Down Expand Up @@ -412,8 +411,5 @@ func (s *Service) getBlobs(
sharesParser := &parser{verifyFn: verifyFn}

_, _, err = s.retrieve(ctx, header.Height(), namespace, sharesParser)
if len(blobs) == 0 {
return nil, ErrBlobNotFound
}
return blobs, nil
return blobs, err
}
24 changes: 22 additions & 2 deletions blob/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"sort"
"testing"
"time"

"github.com/golang/mock/gomock"
ds "github.com/ipfs/go-datastore"
ds_sync "github.com/ipfs/go-datastore/sync"
"github.com/stretchr/testify/assert"
Expand All @@ -20,10 +22,10 @@ import (
"github.com/celestiaorg/celestia-app/pkg/shares"
"github.com/celestiaorg/go-header/store"


"github.com/celestiaorg/celestia-node/blob/blobtest"
"github.com/celestiaorg/celestia-node/header"
"github.com/celestiaorg/celestia-node/header/headertest"
shareMock "github.com/celestiaorg/celestia-node/nodebuilder/share/mocks"
"github.com/celestiaorg/celestia-node/share"
"github.com/celestiaorg/celestia-node/share/getters"
"github.com/celestiaorg/celestia-node/share/ipld"
Expand Down Expand Up @@ -306,7 +308,7 @@ func TestBlobService_Get(t *testing.T) {
blobs, ok := i.([]*Blob)
require.True(t, ok)
assert.Empty(t, blobs)
assert.Empty(t, err)
assert.Nil(t, err)
vgonkivs marked this conversation as resolved.
Show resolved Hide resolved
},
},
{
Expand All @@ -328,6 +330,24 @@ func TestBlobService_Get(t *testing.T) {
require.NoError(t, proof.equal(*newProof))
},
},
{
name: "internal error",
vgonkivs marked this conversation as resolved.
Show resolved Hide resolved
doFn: func() (interface{}, error) {
ctrl := gomock.NewController(t)
shareGetterMock := shareMock.NewMockModule(ctrl)
service.shareGetter = shareGetterMock
shareGetterMock.EXPECT().
GetSharesByNamespace(gomock.Any(), gomock.Any(), gomock.Any()).
Return(nil, errors.New("internal error"))
return service.GetAll(ctx, 1, []share.Namespace{blobs0[0].Namespace()})
},
expectedResult: func(res interface{}, err error) {
blobs, ok := res.([]*Blob)
require.True(t, ok)
assert.Empty(t, blobs)
require.Error(t, err)
},
},
}

for _, tt := range test {
Expand Down