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

Signed-off-by: pennylees <techdashen@msn.com>

Author: pennylees

pkg/bertyvcissuer/verifiable_public_key_fetcher.go

@@ -3,6 +3,7 @@ package bertyvcissuer
 import (
 	"crypto/ed25519"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/hyperledger/aries-framework-go/pkg/doc/signature/verifier"
@@ -18,13 +19,7 @@ func embeddedPublicKeyFetcher(issuerID string, allowList []string) (*verifier.Pu
 	}
 
 	if len(allowList) > 0 {
-		found := false
-		for _, allowed := range allowList {
-			if allowed == issuerID {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(allowList, issuerID)
 
 		if !found {
 			return nil, errcode.ErrCode_ErrServicesDirectoryInvalidVerifiedCredentialID.Wrap(fmt.Errorf("issuer is not allowed"))

pkg/errcode/error.go

@@ -3,6 +3,7 @@ package errcode
 import (
 	"fmt"
 	"io"
+	"slices"
 
 	"golang.org/x/xerrors"
 	"google.golang.org/grpc/codes"
@@ -43,12 +44,7 @@ func Codes(err error) []ErrCode {
 // Has returns true if one of the error is or contains (wraps) an expected errcode
 func Has(err error, code WithCode) bool {
 	codeCode := code.Code()
-	for _, otherCode := range Codes(err) {
-		if otherCode == codeCode {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(Codes(err), codeCode)
 }
 
 // Is returns true if the top-level error (it doesn't unwrap it) is actually an ErrCode of the same value

pkg/tinder/driver_localdiscovery.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math/rand"
+	"slices"
 	"sync"
 	"time"
 
@@ -449,11 +450,8 @@ func (ld *LocalDiscovery) monitorConnection(ctx context.Context) error {
 					ld.handleConnection(ctx, evt.Peer)
 				}
 			case event.EvtPeerProtocolsUpdated:
-				for _, added := range evt.Added {
-					if added == recProtocolID {
-						ld.handleConnection(ctx, evt.Peer)
-						break
-					}
+				if slices.Contains(evt.Added, recProtocolID) {
+					ld.handleConnection(ctx, evt.Peer)
 				}
 			}
 		}

pkg/tinder/driver_mock.go

@@ -3,6 +3,7 @@ package tinder
 import (
 	"context"
 	"fmt"
+	"slices"
 	"sync"
 	"time"
 
@@ -130,10 +131,8 @@ func (s *MockDriverServer) WaitForPeer(topic string, p peer.ID, timeout time.Dur
 		}
 
 		// send peers
-		for _, upeer := range updated {
-			if upeer == p {
-				return nil
-			}
+		if slices.Contains(updated, p) {
+			return nil
 		}
 	}
 }

pkg/tyber/format.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"slices"
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -52,12 +53,7 @@ const (
 var KnownLogTypes = []LogType{TraceType, StepType, EventType, SubscribeType}
 
 func (lt LogType) IsKnown() bool {
-	for _, vlt := range KnownLogTypes {
-		if lt == vlt {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(KnownLogTypes, lt)
 }
 
 type StatusType string

store_metadata.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"slices"
 	"strings"
 
 	coreiface "github.com/ipfs/kubo/core/coreiface"
@@ -427,13 +428,7 @@ func (m *MetadataStore) ListContactsByStatus(states ...protocoltypes.ContactStat
 	contacts := []*protocoltypes.ShareableContact(nil)
 
 	for _, c := range idx.contacts {
-		hasState := false
-		for _, s := range states {
-			if c.state == s {
-				hasState = true
-				break
-			}
-		}
+		hasState := slices.Contains(states, c.state)
 
 		if hasState {
 			contacts = append(contacts, c.contact)
@@ -876,13 +871,7 @@ func (m *MetadataStore) getContactStatus(pk crypto.PubKey) protocoltypes.Contact
 func (m *MetadataStore) checkContactStatus(pk crypto.PubKey, states ...protocoltypes.ContactState) bool {
 	contactStatus := m.getContactStatus(pk)
 
-	for _, s := range states {
-		if contactStatus == s {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(states, contactStatus)
 }
 
 type EventMetadataReceived struct {
@@ -1027,19 +1016,19 @@ func constructorFactoryGroupMetadata(s *WeshOrbitDB, logger *zap.Logger) iface.S
 
 func (m *MetadataStore) initEmitter() (err error) {
 	if m.emitters.metadataReceived, err = m.eventBus.Emitter(new(EventMetadataReceived)); err != nil {
-		return
+		return err
 	}
 
 	if m.emitters.groupMetadata, err = m.eventBus.Emitter(new(*protocoltypes.GroupMetadataEvent)); err != nil {
-		return
+		return err
 	}
 
-	return
+	return err
 }
 
 func genNewSeed() (seed []byte, err error) {
 	seed, err = io.ReadAll(io.LimitReader(crand.Reader, protocoltypes.RendezvousSeedLength))
-	return
+	return seed, err
 }
 
 func (m *MetadataStore) Close() error {