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

fix(share/getters)!: return nil shares from all getters in non-inclusion case #3454

Merged
merged 2 commits into from
Jun 3, 2024
Merged

fix(share/getters)!: return nil shares from all getters in non-inclusion case #3454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e933b
return nil from all getters in non-inclusion case
walldiss Jun 3, 2024
1741883
Merge branch 'main' into consistency-in-non-inclusion-getter
walldiss Jun 3, 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
2 changes: 1 addition & 1 deletion share/getter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type NamespacedShares []NamespacedRow

// Flatten returns the concatenated slice of all NamespacedRow shares.
func (ns NamespacedShares) Flatten() []Share {
shares := make([]Share, 0)
var shares []Share
for _, row := range ns {
shares = append(shares, row.Shares...)
}
Expand Down
4 changes: 2 additions & 2 deletions share/getters/getter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestStoreGetter(t *testing.T) {
randNamespace := sharetest.RandV0Namespace()
emptyShares, err := sg.GetSharesByNamespace(ctx, eh, randNamespace)
require.NoError(t, err)
require.Empty(t, emptyShares.Flatten())
require.Nil(t, emptyShares.Flatten())

// root not found
emptyRoot := da.MinDataAvailabilityHeader()
Expand Down Expand Up @@ -229,7 +229,7 @@ func TestIPLDGetter(t *testing.T) {
randNamespace := sharetest.RandV0Namespace()
emptyShares, err := sg.GetSharesByNamespace(ctx, eh, randNamespace)
require.NoError(t, err)
require.Empty(t, emptyShares.Flatten())
require.Nil(t, emptyShares.Flatten())

// nid doesn't exist in root
emptyRoot := da.MinDataAvailabilityHeader()
Expand Down
15 changes: 14 additions & 1 deletion share/getters/shrex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ func TestShrexGetter(t *testing.T) {
Height: 1,
})

// namespace inside root range
nID, err := addToNamespace(maxNamespace, -1)
require.NoError(t, err)
// check for namespace to be between max and min namespace in root
Expand All @@ -118,7 +119,19 @@ func TestShrexGetter(t *testing.T) {
emptyShares, err := getter.GetSharesByNamespace(ctx, eh, nID)
require.NoError(t, err)
// no shares should be returned
require.Empty(t, emptyShares.Flatten())
require.Nil(t, emptyShares.Flatten())
require.Nil(t, emptyShares.Verify(dah, nID))

// namespace outside root range
nID, err = addToNamespace(maxNamespace, 1)
require.NoError(t, err)
// check for namespace to be not in root
require.Len(t, ipld.FilterRootByNamespace(dah, nID), 0)

emptyShares, err = getter.GetSharesByNamespace(ctx, eh, nID)
require.NoError(t, err)
// no shares should be returned
require.Nil(t, emptyShares.Flatten())
require.Nil(t, emptyShares.Verify(dah, nID))
})

Expand Down
5 changes: 4 additions & 1 deletion share/ipld/get_shares.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,17 @@ func GetSharesByNamespace(
}

leaves := data.Leaves()
if len(leaves) == 0 {
return nil, data.Proof(), nil
}

shares := make([]share.Share, len(leaves))
for i, leaf := range leaves {
if leaf != nil {
shares[i] = leafToShare(leaf)
}
}
return shares, data.Proof(), err
return shares, data.Proof(), nil
}

// leafToShare converts an NMT leaf into a Share.
Expand Down
Loading