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

chore!: remove BlobsByNamespace #1025

Merged
merged 3 commits into from
Jun 20, 2023
Merged

chore!: remove BlobsByNamespace #1025

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ffd80c
chore: remove BlobsByNamespace
evan-forbes Jun 19, 2023
e81fac7
Merge branch 'v0.34.x-celestia' into evan/remove-BlobsByNamespace
evan-forbes Jun 19, 2023
1363a0e
use bullseye env for e2e tests
cmwaters Jun 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
20 changes: 0 additions & 20 deletions types/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,26 +1036,6 @@ func (data *Data) Hash() cmtbytes.HexBytes {
return data.hash
}

// BlobsByNamespace implements sort.Interface for Blob
type BlobsByNamespace []Blob

func (b BlobsByNamespace) Len() int {
return len(b)
}

func (b BlobsByNamespace) Swap(i, j int) {
b[i], b[j] = b[j], b[i]
}

func (b BlobsByNamespace) Less(i, j int) bool {
// The following comparison is `<` and not `<=` because bytes.Compare returns 0 for if a == b.
// We want this comparison to return `false` if a == b because:
// If both Less(i, j) and Less(j, i) are false,
// then the elements at index i and j are considered equal.
// See https://pkg.go.dev/sort#Interface
return bytes.Compare(b[i].NamespaceID, b[j].NamespaceID) < 0
}

type Blob struct {
// NamespaceVersion is the version of the namespace. Used in conjunction
// with NamespaceID to determine the namespace of this blob.
Expand Down
53 changes: 0 additions & 53 deletions types/block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"math"
"os"
"reflect"
"sort"
"testing"
"time"

Expand Down Expand Up @@ -857,55 +856,3 @@ func TestBlockIDEquals(t *testing.T) {
assert.True(t, blockIDEmpty.Equals(blockIDEmpty))
assert.False(t, blockIDEmpty.Equals(blockIDDifferent))
}

func TestBlobsByNamespaceIsSorted(t *testing.T) {
sortedBlobs := []Blob{
{
NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8},
Data: stdbytes.Repeat([]byte{1}, 100),
},
{
NamespaceID: []byte{8, 7, 6, 5, 4, 3, 2, 1},
Data: stdbytes.Repeat([]byte{2}, 100),
},
}
sameNamespacedBlobs := []Blob{
{
NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8},
Data: stdbytes.Repeat([]byte{1}, 100),
},
{
NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8},
Data: stdbytes.Repeat([]byte{2}, 100),
},
}
unsortedBlobs := []Blob{
{
NamespaceID: []byte{8, 7, 6, 5, 4, 3, 2, 1},
Data: stdbytes.Repeat([]byte{1}, 100),
},
{
NamespaceID: []byte{1, 2, 3, 4, 5, 6, 7, 8},
Data: stdbytes.Repeat([]byte{2}, 100),
},
}

type testCase struct {
description string
blobs []Blob
want bool
}

tests := []testCase{
{"sorted blobs", sortedBlobs, true},
{"same namespace blobs", sameNamespacedBlobs, true},
{"unsorted blobs", unsortedBlobs, false},
}

for _, tc := range tests {
t.Run(tc.description, func(t *testing.T) {
bs := tc.blobs
assert.Equal(t, tc.want, sort.IsSorted(BlobsByNamespace(bs)))
})
}
}