refactor: use slices.Contains to simplify code (#2908)

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

Author: queryfast

pkg/docker/compose.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"text/template"
 	"time"
@@ -283,12 +284,6 @@ func HasRemoteComposeService(host *models.Host, composeFile string, service stri
 	if err != nil {
 		return false, err
 	}
-	found := false
-	for _, s := range services {
-		if s == service {
-			found = true
-			break
-		}
-	}
+	found := slices.Contains(services, service)
 	return found, nil
 }

pkg/docker/image.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
@@ -28,10 +29,8 @@ func DockerLocalImageExists(host *models.Host, image string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	for _, localImage := range parseDockerImageListOutput(output) {
-		if localImage == image {
-			return true, nil
-		}
+	if slices.Contains(parseDockerImageListOutput(output), image) {
+		return true, nil
 	}
 	return false, nil
 }

pkg/prompts/prompts.go

@@ -125,13 +125,7 @@ func CheckSubnetAuthKeys(walletKeys []string, subnetAuthKeys []string, controlKe
 		return fmt.Errorf("number of given auth keys differs from the threshold")
 	}
 	for _, subnetAuthKey := range subnetAuthKeys {
-		found := false
-		for _, controlKey := range controlKeys {
-			if subnetAuthKey == controlKey {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(controlKeys, subnetAuthKey)
 		if !found {
 			return fmt.Errorf("auth key %s does not belong to control keys", subnetAuthKey)
 		}

pkg/prompts/prompts_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"testing"
 
 	"github.com/ava-labs/avalanche-cli/pkg/key"
@@ -670,12 +671,7 @@ func TestPromptChain(t *testing.T) {
 		mockPrompt := &mocks.Prompter{}
 		mockPrompt.On("CaptureListWithSize", prompt, mock.MatchedBy(func(options []string) bool {
 			// Should contain "Custom" option
-			for _, opt := range options {
-				if opt == Custom {
-					return true
-				}
-			}
-			return false
+			return slices.Contains(options, Custom)
 		}), 11).Return(Custom, nil).Once()
 		mockPrompt.On("CaptureString", "Blockchain ID/Alias").Return("custom-blockchain-id", nil).Once()
 		notListed, pChain, xChain, cChain, subnetName, blockchainID, err := PromptChain(
@@ -694,12 +690,7 @@ func TestPromptChain(t *testing.T) {
 		mockPrompt := &mocks.Prompter{}
 		mockPrompt.On("CaptureListWithSize", prompt, mock.MatchedBy(func(options []string) bool {
 			// Should contain "My blockchain isn't listed" option
-			for _, opt := range options {
-				if opt == "My blockchain isn't listed" {
-					return true
-				}
-			}
-			return false
+			return slices.Contains(options, "My blockchain isn't listed")
 		}), 11).Return("My blockchain isn't listed", nil).Once()
 		notListed, pChain, xChain, cChain, subnetName, blockchainID, err := PromptChain(
 			mockPrompt, prompt, subnetNames, true, true, true, avoidBlockchainName, false)

pkg/utils/common.go

@@ -16,6 +16,7 @@ import (
 	"os/exec"
 	"os/user"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"syscall"
@@ -38,7 +39,6 @@ import (
 	"github.com/ava-labs/subnet-evm/core"
 
 	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
-	"golang.org/x/exp/slices"
 	"golang.org/x/mod/semver"
 )
 
@@ -94,12 +94,7 @@ func GetRealFilePath(path string) string {
 }
 
 func Any[T any](input []T, f func(T) bool) bool {
-	for _, e := range input {
-		if f(e) {
-			return true
-		}
-	}
-	return false
+	return slices.ContainsFunc(input, f)
 }
 
 func Find[T any](input []T, f func(T) bool) *T {

pkg/vm/precompiles_test.go

@@ -4,6 +4,7 @@
 package vm
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/ava-labs/avalanche-cli/internal/testutils"
@@ -173,13 +174,7 @@ func TestAddAddressToAllowed(t *testing.T) {
 			// Check if the address was added to enabled list when expected
 			if tt.shouldAddToEnabled {
 				expectedAddress := common.HexToAddress(tt.addressToAdd)
-				found := false
-				for _, addr := range result.EnabledAddresses {
-					if addr == expectedAddress {
-						found = true
-						break
-					}
-				}
+				found := slices.Contains(result.EnabledAddresses, expectedAddress)
 				require.True(t, found, "Address should have been added to enabled list")
 			}