refactor: use the built-in max/min to simplify the code (algorand#6338)

Signed-off-by: knowmost <knowmost@outlook.com>

Author: knowmost

crypto/statetrie/nibbles/nibbles.go

@@ -83,10 +83,7 @@ func ShiftLeft(nyb1 Nibbles, numNibbles int) Nibbles {
 // SharedPrefix returns a slice from nyb1 that contains the shared prefix
 // between nyb1 and nyb2
 func SharedPrefix(nyb1 Nibbles, nyb2 Nibbles) Nibbles {
-	minLength := len(nyb1)
-	if len(nyb2) < minLength {
-		minLength = len(nyb2)
-	}
+	minLength := min(len(nyb2), len(nyb1))
 	for i := 0; i < minLength; i++ {
 		if nyb1[i] != nyb2[i] {
 			return nyb1[:i]

network/limitlistener/rejectingLimitListener_test.go

@@ -24,10 +24,8 @@ func TestRejectingLimitListenerBasic(t *testing.T) {
 	partitiontest.PartitionTest(t)
 
 	const limit = 5
-	attempts := (maxOpenFiles() - limit) / 2
-	if attempts > 256 { // maximum length of accept queue is 128 by default
-		attempts = 256
-	}
+	// maximum length of accept queue is 128 by default
+	attempts := min((maxOpenFiles()-limit)/2, 256)
 
 	l, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {

tools/debug/carpenter/main.go

@@ -305,10 +305,7 @@ func outputTableFormat(out string, event logspec.Event, columns []string, colPos
 	maxLen := len(out)
 	for i := 0; i < rowCount; i++ {
 		start := i * columnWidth
-		end := start + columnWidth
-		if end > maxLen {
-			end = maxLen
-		}
+		end := min(start+columnWidth, maxLen)
 		if start < len(out) {
 			row := strings.TrimSpace(out[start:end])
 			output := ""

util/bloom/bloom.go

@@ -50,10 +50,7 @@ func Optimal(numElements int, falsePositiveRate float64) (sizeBits int, numHashe
 	m := -(n+0.5)*math.Log(p)/math.Pow(math.Log(2), 2) + 1
 	k := -math.Log(p) / math.Log(2)
 
-	numHashes = uint32(math.Ceil(k))
-	if numHashes > maxHashes {
-		numHashes = maxHashes
-	}
+	numHashes = min(uint32(math.Ceil(k)), maxHashes)
 
 	return int(math.Ceil(m)), numHashes
 }

util/watchdogStreamReader.go

@@ -110,10 +110,7 @@ func (r *watchdogStreamReader) Read(p []byte) (n int, err error) {
 	}
 	if len(r.stageBuffer) > 0 {
 		// copy the data to the buffer p
-		n = len(p)
-		if n > len(r.stageBuffer) {
-			n = len(r.stageBuffer)
-		}
+		n = min(len(p), len(r.stageBuffer))
 		copy(p, r.stageBuffer)
 		r.stageBuffer = r.stageBuffer[n:]
 	}