chore(all): modernized code with slices

x/wasm/migrations/v2/params_legacy.go

@@ -8,6 +8,7 @@ package v2
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 
 	"github.com/cosmos/gogoproto/jsonpb"
 
@@ -60,10 +61,8 @@ func validateAccessType(i interface{}) error {
 	if a == AccessTypeUnspecified {
 		return errorsmod.Wrap(types.ErrEmpty, "type")
 	}
-	for _, v := range AllAccessTypes {
-		if v == a {
-			return nil
-		}
+	if slices.Contains(AllAccessTypes, a) {
+		return nil
 	}
 	return errorsmod.Wrapf(types.ErrInvalid, "unknown type: %q", a)
 }

x/wasm/types/json_matching.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"encoding/json"
+	"slices"
 )
 
 // isJSONObjectWithTopLevelKey returns true if the given bytes are a valid JSON object
@@ -22,10 +23,8 @@ func isJSONObjectWithTopLevelKey(jsonBytes RawContractMessage, allowedKeys []str
 
 	// Loop is executed exactly once
 	for topLevelKey := range document {
-		for _, allowedKey := range allowedKeys {
-			if allowedKey == topLevelKey {
-				return true, nil
-			}
+		if slices.Contains(allowedKeys, topLevelKey) {
+			return true, nil
 		}
 		return false, nil
 	}

x/wasm/types/params.go

@@ -2,6 +2,7 @@
 
 import (
 	"encoding/json"
+	"slices"
 
 	"github.com/cosmos/gogoproto/jsonpb"
 	"github.com/pkg/errors"
@@ -113,10 +114,8 @@
 	if a == AccessTypeUnspecified {
 		return errorsmod.Wrap(ErrEmpty, "type")
 	}
-	for _, v := range AllAccessTypes {
-		if v == a {
-			return nil
-		}
+	if slices.Contains(AllAccessTypes, a) {
+		return nil
 	}
 	return errorsmod.Wrapf(ErrInvalid, "unknown type: %q", a)
 }
@@ -143,12 +142,7 @@
 	case AccessTypeEverybody:
 		return true
 	case AccessTypeAnyOfAddresses:
-		for _, v := range a.Addresses {
-			if v == actor.String() {
-				return true
-			}
-		}
-		return false
+		return slices.Contains(a.Addresses, actor.String())
 	default:
 		panic("unknown type")
 	}

x/wasm/types/types.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"reflect"
+	"slices"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
 	"github.com/cosmos/gogoproto/proto"
@@ -418,13 +419,10 @@ func isSubset(super, sub []string) bool {
 	if len(sub) == 0 {
 		return true
 	}
-	var matches int
+	matches := 0
 	for _, o := range sub {
-		for _, s := range super {
-			if o == s {
-				matches++
-				break
-			}
+		if slices.Contains(super, o) {
+			matches++
 		}
 	}
 	return matches == len(sub)