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

fix: end exclusive data commitment range fix #1058

Merged
merged 3 commits into from
Aug 10, 2023
Merged

fix: end exclusive data commitment range fix #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5075e8d
fix: end exclusive data commitment range fix
rach-id Aug 9, 2023
8ac2fa4
Update rpc/core/blocks_test.go
rach-id Aug 9, 2023
13460c5
Update rpc/core/blocks.go
rach-id Aug 9, 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
5 changes: 3 additions & 2 deletions rpc/core/blocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,10 @@ func validateDataCommitmentRange(start uint64, end uint64) error {
if start >= end {
return fmt.Errorf("last block is smaller than first block")
}
if end > uint64(env.BlockStore.Height()) {
// the data commitment range is end exclusive
if end > uint64(env.BlockStore.Height())+1 {
return fmt.Errorf(
"last block %d is higher than current chain height %d",
"end block %d is higher than current chain height %d",
end,
env.BlockStore.Height(),
)
Expand Down
11 changes: 8 additions & 3 deletions rpc/core/blocks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ func TestDataCommitmentResults(t *testing.T) {
{0, 1000, false},
{0, 10, false},
{10, 8, false},
// to test the end exclusive support for ranges.
// the end block could be equal to (height+1), but the data commitment would only
// take up to height. So we should be able to send request having end block equal
// to (height+1).
{int(env.BlockStore.Height()) - 100, int(env.BlockStore.Height()) + 1, true},
}

for i, tc := range testCases {
Expand Down Expand Up @@ -333,10 +338,10 @@ func (indexer mockBlockIndexer) Search(ctx context.Context, _ *query.Query) ([]i
return results, nil
}

// randomBlocks generates a set of random blocks up to the provided height.
// randomBlocks generates a set of random blocks up to (and including) the provided height.
func randomBlocks(height int64) []*types.Block {
blocks := make([]*types.Block, height)
for i := int64(0); i < height; i++ {
blocks := make([]*types.Block, height+1)
Copy link
Member Author

@rach-id rach-id Aug 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

[note to reviewers]
Here, when we want to generate blocks up to a certain height, then we gonna have height+1 number of blocks because of genesis

for i := int64(0); i <= height; i++ {
blocks[i] = randomBlock(i)
}
return blocks
Expand Down
Loading