refactor: using slices.Contains to simplify the code

Signed-off-by: damuzhi0810 <[email protected]>

cmd/algons/dnsCmd.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"os"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 
@@ -439,13 +440,7 @@ func checkedDelete(toDelete []cloudflare.DNSRecordResponseEntry, cloudflareDNS *
 
 func getEntries(getNetwork string, recordType string) ([]cloudflare.DNSRecordResponseEntry, error) {
 	recordTypes := []string{"A", "CNAME", "SRV", "TXT"}
-	isKnown := false
-	for _, known := range append(recordTypes, "") {
-		if recordType == known {
-			isKnown = true
-			break
-		}
-	}
+	isKnown := slices.Contains(recordTypes, recordType)
 	if !isKnown {
 		return nil, fmt.Errorf("invalid recordType specified %s", recordType)
 	}

network/requestTracker.go

@@ -21,13 +21,12 @@ import (
 	"net"
 	"net/http"
 	"net/textproto"
+	"slices"
 	"sort"
 	"strings"
 	"sync/atomic"
 	"time"
 
-	"github.com/algorand/go-deadlock"
-
 	"github.com/algorand/go-algorand/config"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/logging/telemetryspec"
@@ -519,10 +518,5 @@ func (rt *RequestTracker) getForwardedConnectionAddress(header http.Header) (ip
 
 // isLocalhost returns true if the given host is a localhost address.
 func isLocalhost(host string) bool {
-	for _, v := range []string{"localhost", "127.0.0.1", "[::1]", "::1", "[::]"} {
-		if host == v {
-			return true
-		}
-	}
-	return false
+	return slices.Contains([]string{"localhost", "127.0.0.1", "[::1]", "::1", "[::]"}, host)
 }

network/wsPeer.go

@@ -24,13 +24,13 @@ import (
 	"net"
 	"net/http"
 	"runtime"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/algorand/go-deadlock"
 	"github.com/algorand/websocket"
 
 	"github.com/algorand/go-algorand/config"
@@ -52,13 +52,7 @@ const averageMessageLength = 2 * 1024    // Most of the messages are smaller tha
 const msgsInReadBufferPerPeer = 10
 
 func init() {
-	matched := false
-	for _, version := range SupportedProtocolVersions {
-		if version == versionPeerFeatures {
-			matched = true
-		}
-	}
-	if !matched {
+	if !slices.Contains(SupportedProtocolVersions, versionPeerFeatures) {
 		panic(fmt.Sprintf("peer features version %s is not supported %v", versionPeerFeatures, SupportedProtocolVersions))
 	}
 

shared/pingpong/accounts.go

@@ -23,6 +23,7 @@ import (
 	"math/rand"
 	"os"
 	"path/filepath"
+	"slices"
 	"sort"
 	"strings"
 	"time"
@@ -1003,10 +1004,8 @@ func (pps *WorkerState) generateAccounts() {
 }
 
 func uniqueAppend(they []string, x string) []string {
-	for _, v := range they {
-		if v == x {
-			return they
-		}
+	if !slices.Contains(they, x) {
+		return append(they, x)
 	}
-	return append(they, x)
+	return they
 }

shared/pingpong/config.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"time"
 
 	"github.com/algorand/go-algorand/util/codecs"
@@ -192,14 +193,7 @@ var accountSampleMethods = []string{
 
 // Check returns an error if config is invalid.
 func (cfg *PpConfig) Check() error {
-	sampleOk := false
-	for _, v := range accountSampleMethods {
-		if v == cfg.GeneratedAccountSampleMethod {
-			sampleOk = true
-			break
-		}
-	}
-	if !sampleOk {
+	if !slices.Contains(accountSampleMethods, cfg.GeneratedAccountSampleMethod) {
 		return fmt.Errorf("unknown GeneratedAccountSampleMethod: %s", cfg.GeneratedAccountSampleMethod)
 	}
 	if cfg.DeterministicKeys && (cfg.GeneratedAccountsOffset+uint64(cfg.NumPartAccounts) > cfg.GeneratedAccountsCount) {

tools/block-generator/generator/generator_ledger.go

@@ -20,6 +20,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 	"time"
 
@@ -333,14 +334,7 @@ func (g *generator) introspectLedgerVsGenerator(roundNumber, intra uint64) (errs
 	generatorExpectedOptinsNotFound := map[uint64][]uint64{}
 	for appId, appOptins := range expectedOptins[appKindBoxes] {
 		for optin := range appOptins {
-			missing := true
-			for _, boxOptin := range ledgerBoxEvidence[appId] {
-				if boxOptin == optin {
-					missing = false
-					break
-				}
-			}
-			if missing {
+			if !slices.Contains(ledgerBoxEvidence[appId], optin) {
 				generatorExpectedOptinsNotFound[appId] = append(generatorExpectedOptinsNotFound[appId], optin)
 			}
 		}

util/codecs/json.go

@@ -24,6 +24,7 @@ import (
 	"io"
 	"os"
 	"reflect"
+	"slices"
 	"strings"
 )
 
@@ -123,7 +124,7 @@ func WriteNonDefaultValues(writer io.Writer, object, defaultObject interface{},
 			return fmt.Errorf("error processing serialized object - should be at EOF: %s", line)
 		}
 
-		if inStringArray(valName, ignore) {
+		if slices.Contains(ignore, valName) {
 			newFile[newIndex] = line
 			newIndex++
 			continue
@@ -183,15 +184,6 @@ func extractValueName(line string) (name string) {
 	return line[start+1 : end]
 }
 
-func inStringArray(item string, set []string) bool {
-	for _, s := range set {
-		if item == s {
-			return true
-		}
-	}
-	return false
-}
-
 func createValueMap(object interface{}) map[string]interface{} {
 	valueMap := make(map[string]interface{})