Merge pull request #6360 from suranmiao/master

refactor: use slices.Contains to simplify code

Author: peternose

.changelog/6360.trivial.md

@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/oasisprotocol/curve25519-voi/primitives/ed25519"
 	"github.com/oasisprotocol/curve25519-voi/primitives/ed25519/extra/ecvrf"
@@ -81,10 +82,8 @@ type Factory struct {
 // EnsureRole ensures that the SignerFactory is configured for the given
 // role.
 func (fac *Factory) EnsureRole(role signature.SignerRole) error {
-	for _, v := range fac.roles {
-		if v == role {
-			return nil
-		}
+	if slices.Contains(fac.roles, role) {
+		return nil
 	}
 	return signature.ErrRoleMismatch
 }

go/common/crypto/signature/signers/file/file_signer.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/rpc"
 	"os/exec"
+	"slices"
 	"sync"
 
 	hclog "github.com/hashicorp/go-hclog"
@@ -80,10 +81,8 @@ func NewFactory(config any, roles ...signature.SignerRole) (signature.SignerFact
 	// It's not like all the cheap HSMs people seem to like using is going
 	// to support ECVRF anytime soon, when they don't even fully support
 	// RFC 8032.
-	for _, role := range roles {
-		if role == signature.SignerVRF {
-			return nil, signature.ErrVRFNotSupported
-		}
+	if slices.Contains(roles, signature.SignerVRF) {
+		return nil, signature.ErrVRFNotSupported
 	}
 
 	// Why yes, the correct thing to do is to call `client.Kill`,

go/common/crypto/signature/signers/plugin/plugin.go

@@ -3,6 +3,7 @@ package node
 import (
 	"encoding/binary"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/oasisprotocol/curve25519-voi/primitives/x25519"
@@ -121,12 +122,7 @@ func (sc *SGXConstraints) ValidateBasic(cfg *TEEFeatures) error {
 // ContainsEnclave returns true iff the allowed enclave list in SGX constraints contain the given
 // enclave identity.
 func (sc *SGXConstraints) ContainsEnclave(eid sgx.EnclaveIdentity) bool {
-	for _, e := range sc.Enclaves {
-		if eid == e {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(sc.Enclaves, eid)
 }
 
 const (

go/common/node/sgx.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"slices"
 	"time"
 
 	"github.com/oasisprotocol/oasis-core/go/common/sgx"
@@ -270,10 +271,8 @@ func (b *AVRBundle) Open(policy *QuotePolicy, trustRoots *x509.CertPool, ts time
 		return nil, fmt.Errorf("quote open failure: %w", err)
 	}
 	// Validate EPID GID not blacklisted.
-	for _, blocked := range policy.GIDBlacklist {
-		if blocked == quote.Body.GID {
-			return nil, fmt.Errorf("blacklisted quote GID")
-		}
+	if slices.Contains(policy.GIDBlacklist, quote.Body.GID) {
+		return nil, fmt.Errorf("blacklisted quote GID")
 	}
 
 	return avr, nil
@@ -324,13 +323,7 @@ func (a *AttestationVerificationReport) quoteStatusAllowed(policy *QuotePolicy)
 
 	// Search through the constraints to see if the AVR quote status is
 	// explicitly allowed.
-	for _, v := range policy.AllowedQuoteStatuses {
-		if v == status {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(policy.AllowedQuoteStatuses, status)
 }
 
 func (a *AttestationVerificationReport) validate() error { // nolint: gocyclo

go/common/sgx/ias/avr.go

@@ -271,10 +271,8 @@ func (ti *TCBInfo) validate(teeType TeeType, ts time.Time, policy *QuotePolicy)
 	}
 
 	// Validate FMSPC not blacklisted.
-	for _, blocked := range policy.FMSPCBlacklist {
-		if blocked == ti.FMSPC {
-			return fmt.Errorf("pcs/tcb: blacklisted FMSPC")
-		}
+	if slices.Contains(policy.FMSPCBlacklist, ti.FMSPC) {
+		return fmt.Errorf("pcs/tcb: blacklisted FMSPC")
 	}
 
 	return nil