diff --git a/changelog/stemlaud-use-builtin-max-min.md b/changelog/stemlaud-use-builtin-max-min.md new file mode 100644 index 000000000000..a6bce2b0801f --- /dev/null +++ b/changelog/stemlaud-use-builtin-max-min.md @@ -0,0 +1,3 @@ +### Fixed + +- switch to built-in min/max \ No newline at end of file diff --git a/encoding/bytesutil/integers.go b/encoding/bytesutil/integers.go index 294e39d96059..e4dd912ac9ae 100644 --- a/encoding/bytesutil/integers.go +++ b/encoding/bytesutil/integers.go @@ -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] diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index cbf75fa9f356..a8477082b086 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -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 diff --git a/testing/slasher/simulator/attestation_generator.go b/testing/slasher/simulator/attestation_generator.go index 3e944e3d0aa7..a06142cbece6 100644 --- a/testing/slasher/simulator/attestation_generator.go +++ b/testing/slasher/simulator/attestation_generator.go @@ -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) diff --git a/validator/client/beacon-api/beacon_api_beacon_chain_client.go b/validator/client/beacon-api/beacon_api_beacon_chain_client.go index 29ea1c4e37b0..d70e3007d7bb 100644 --- a/validator/client/beacon-api/beacon_api_beacon_chain_client.go +++ b/validator/client/beacon-api/beacon_api_beacon_chain_client.go @@ -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++ {