Skip to content

chore: refactor to use builtin max/min #15851

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 4 commits into from
Closed

chore: refactor to use builtin max/min #15851

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56ab1c6
chore: refactor to use builtin max/min
stemlaud Oct 11, 2025
a8b7201
Merge branch 'develop' into use-max-min
james-prysm Oct 13, 2025
efbc035
Merge branch 'develop' into use-max-min
rkapka Oct 20, 2025
d915233
Merge branch 'develop' into use-max-min
prestonvanloon Nov 21, 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
3 changes: 3 additions & 0 deletions changelog/stemlaud-use-builtin-max-min.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Fixed

- switch to built-in min/max
5 changes: 1 addition & 4 deletions encoding/bytesutil/integers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ func ToBytes(x uint64, length int) []byte {
if length < 0 {
length = 0
}
makeLength := length
if length < 8 {
makeLength = 8
}
makeLength := max(length, 8)
bytes := make([]byte, makeLength)
binary.LittleEndian.PutUint64(bytes, x)
return bytes[:length]
Expand Down
5 changes: 1 addition & 4 deletions testing/endtoend/components/eth1/transactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,7 @@ func encodeBlobs(data []byte) []kzg4844.Blob {
blobIndex++
fieldIndex = 0
}
max := i + 31
if max > len(data) {
max = len(data)
}
max := min(i+31, len(data))
copy(blobs[blobIndex][fieldIndex*32+1:], data[i:max])
}
return blobs
Expand Down
5 changes: 1 addition & 4 deletions testing/slasher/simulator/attestation_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ func (s *Simulator) generateAttestationsForSlot(ctx context.Context, ver int, sl

valsPerAttestation := uint64(math.Floor(s.srvConfig.Params.AggregationPercent * float64(valsPerCommittee)))
for i := startIdx; i < endIdx; i += valsPerAttestation {
attEndIdx := i + valsPerAttestation
if attEndIdx >= endIdx {
attEndIdx = endIdx
}
attEndIdx := min(i+valsPerAttestation, endIdx)
indices := make([]uint64, 0, valsPerAttestation)
for idx := i; idx < attEndIdx; idx++ {
indices = append(indices, idx)
Expand Down
10 changes: 2 additions & 8 deletions validator/client/beacon-api/beacon_api_beacon_chain_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,9 @@ func (c beaconApiChainClient) Validators(ctx context.Context, in *ethpb.ListVali
return nil, errors.New("state validators data is nil")
}

start := pageToken * uint64(pageSize)
if start > uint64(len(stateValidators.Data)) {
start = uint64(len(stateValidators.Data))
}
start := min(pageToken*uint64(pageSize), uint64(len(stateValidators.Data)))

end := start + uint64(pageSize)
if end > uint64(len(stateValidators.Data)) {
end = uint64(len(stateValidators.Data))
}
end := min(start+uint64(pageSize), uint64(len(stateValidators.Data)))

validators := make([]*ethpb.Validators_ValidatorContainer, end-start)
for idx := start; idx < end; idx++ {
Expand Down