refactor: use slices.Contains to simplify code

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

Author: keeghcet

core/chaincode/platforms/util/writer.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
@@ -37,10 +38,8 @@ func WriteFolderToTarPackage(tw *tar.Writer, srcPath string, excludeDirs []strin
 		}
 
 		if info.Mode().IsDir() {
-			for _, excluded := range append(excludeDirs, ".git") {
-				if info.Name() == excluded {
-					return filepath.SkipDir
-				}
+			if slices.Contains(append(excludeDirs, ".git"), info.Name()) {
+				return filepath.SkipDir
 			}
 			return nil
 		}

core/container/externalbuilder/externalbuilder.go

@@ -14,6 +14,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"time"
 
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
@@ -418,10 +419,5 @@ func appendDefaultPropagateEnvironment(propagateEnvironment []string) []string {
 }
 
 func contains(propagateEnvironment []string, key string) bool {
-	for _, variable := range propagateEnvironment {
-		if key == variable {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(propagateEnvironment, key)
 }

core/ledger/kvledger/pause_resume_test.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package kvledger
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
@@ -133,10 +134,5 @@ func assertLedgerStatus(t *testing.T, provider *Provider, genesisBlocks []*commo
 }
 
 func contains(slice []int, val int) bool {
-	for _, item := range slice {
-		if item == val {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(slice, val)
 }

core/ledger/kvledger/tests/env.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"testing"
 	"time"
 
@@ -318,10 +319,8 @@ type membershipInfoProvider struct {
 func (p *membershipInfoProvider) AmMemberOf(channelName string, collectionPolicyConfig *peer.CollectionPolicyConfig) (bool, error) {
 	members := convertFromMemberOrgsPolicy(collectionPolicyConfig)
 	fmt.Printf("members = %s\n", members)
-	for _, m := range members {
-		if m == p.myOrgMSPID {
-			return true, nil
-		}
+	if slices.Contains(members, p.myOrgMSPID) {
+		return true, nil
 	}
 	return false, nil
 }

core/ledger/kvledger/txmgmt/statedb/commontests/test_common.go

@@ -8,6 +8,7 @@ package commontests
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"testing"
 
@@ -1163,12 +1164,7 @@ func CreateTestData(t *testing.T, db statedb.VersionedDB, ns string, numKeys int
 type stringset []string
 
 func (s stringset) contains(str string) bool {
-	for _, element := range s {
-		if element == str {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(s, str)
 }
 
 func (s stringset) minus(toMinus stringset) stringset {

core/ledger/kvledger/txmgmt/statedb/statecouchdb/cache.go

@@ -9,6 +9,7 @@ package statecouchdb
 import (
 	"github.com/VictoriaMetrics/fastcache"
 	"google.golang.org/protobuf/proto"
+	"slices"
 )
 
 var keySep = []byte{0x00}
@@ -45,10 +46,8 @@ func newCache(usrCacheSizeMBs int, sysNamespaces []string) *cache {
 // Namespace can be of two types: system namespace (such as lscc) and user
 // namespace (all user's chaincode states).
 func (c *cache) enabled(namespace string) bool {
-	for _, ns := range c.sysNamespaces {
-		if namespace == ns {
-			return true
-		}
+	if slices.Contains(c.sysNamespaces, namespace) {
+		return true
 	}
 	return c.usrCache != nil
 }
@@ -152,10 +151,8 @@ func (c *cache) Reset() {
 }
 
 func (c *cache) getCache(namespace string) *fastcache.Cache {
-	for _, ns := range c.sysNamespaces {
-		if namespace == ns {
-			return c.sysCache
-		}
+	if slices.Contains(c.sysNamespaces, namespace) {
+		return c.sysCache
 	}
 	return c.usrCache
 }

core/transientstore/store.go

@@ -8,6 +8,7 @@ package transientstore
 
 import (
 	"path/filepath"
+	"slices"
 
 	"github.com/hyperledger/fabric-lib-go/common/flogging"
 	"github.com/hyperledger/fabric-protos-go-apiv2/ledger/rwset"
@@ -156,11 +157,9 @@ func (provider *storeProvider) markStorageForDelete(ledgerID string) error {
 	}
 
 	// don't update if the storage is already marked for deletion.
-	for _, l := range marked.List {
-		if ledgerID == l {
-			logger.Infow("Transient storage was already marked for delete", "ledgerID", ledgerID)
-			return nil
-		}
+	if slices.Contains(marked.List, ledgerID) {
+		logger.Infow("Transient storage was already marked for delete", "ledgerID", ledgerID)
+		return nil
 	}
 
 	marked.List = append(marked.List, ledgerID)