Skip to content

refactor: to use std libary func bytes.CutPrefix #25361

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

Closed
wants to merge 3 commits into from
Closed

refactor: to use std libary func bytes.CutPrefix #25361

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70e20f0
refactor: to use std libary func bytes.CutPrefix
cuiweixie Sep 22, 2025
acfe634
Merge branch 'main' into bytes.CutPrefix
cuiweixie Sep 29, 2025
9feae01
Merge branch 'main' into bytes.CutPrefix
aljo242 Oct 1, 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
14 changes: 4 additions & 10 deletions store/prefix/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ func (pi *prefixIterator) Key() (key []byte) {
}

key = pi.iter.Key()
key = stripPrefix(key, pi.prefix)
key, ok := bytes.CutPrefix(key, pi.prefix)
if !ok {
panic("should not happen")

Check warning

Code scanning / CodeQL

Panic in BeginBock or EndBlock consensus methods Warning

Possible panics in BeginBock- or EndBlock-related consensus methods could cause a chain halt
}

return
}
Expand Down Expand Up @@ -192,15 +195,6 @@ func (pi *prefixIterator) Error() error {
return nil
}

// stripPrefix is copied from github.com/cometbft/cometbft/libs/db/prefix_db.go
func stripPrefix(key, prefix []byte) []byte {
if len(key) < len(prefix) || !bytes.Equal(key[:len(prefix)], prefix) {
panic("should not happen")
}

return key[len(prefix):]
}

// cpIncr wraps the bytes in types.PrefixEndBytes
func cpIncr(bz []byte) []byte {
return types.PrefixEndBytes(bz)
Expand Down