cleanup

Signed-off-by: Angelo De Caro <[email protected]>

Author: adecaro

pkg/utils/errors/errors.go

@@ -8,6 +8,11 @@ package errors
 
 import "github.com/cockroachdb/errors"
 
+// Join returns an error that wraps the given errors.
+func Join(errs ...error) error {
+	return errors.Join(errs...)
+}
+
 // HasType recursively checks errors wrapped using Wrapf until it detects the target error type
 func HasType(source, target error) bool {
 	return source != nil && target != nil && errors.As(source, &target)

platform/common/utils/collections/slices.go

@@ -20,3 +20,13 @@ func Intersection[V comparable](a, b []V) []V { return slices.Intersection(a, b)
 func Repeat[T any](item T, times int) []T { return slices.Repeat(item, times) }
 
 func GetUnique[T any](vs iterators.Iterator[T]) (T, error) { return iterators.GetUnique(vs) }
+
+func FilterSlice[T any](input []T, keep func(T) bool) []T {
+	out := make([]T, 0, len(input))
+	for _, v := range input {
+		if keep(v) {
+			out = append(out, v)
+		}
+	}
+	return out
+}

platform/view/services/endpoint/service.go

@@ -16,6 +16,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	cdriver "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
@@ -147,25 +148,13 @@ func (r *Service) GetResolver(ctx context.Context, id view.Identity) (*Resolver,
 }
 
 func (r *Service) Bind(ctx context.Context, longTerm view.Identity, ephemeralIDs ...view.Identity) error {
-	// check the IDs are different
-	for _, ephemeral := range ephemeralIDs {
-		if longTerm.Equal(ephemeral) {
-			logger.DebugfContext(ctx, "cannot bind [%s] to [%s], they are the same", longTerm, ephemeral)
-			return nil
-		}
-	}
-
-	// if all IDs are different, print to the log
-	for _, ephemeral := range ephemeralIDs {
-		logger.DebugfContext(ctx, "bind [%s] to [%s]", ephemeral, longTerm)
+	// filter out the ids that are equal to longTerm
+	toBind := collections.FilterSlice(ephemeralIDs, func(id view.Identity) bool {
+		return !longTerm.Equal(id)
+	})
+	if err := r.bindingKVS.PutBindings(ctx, longTerm, toBind...); err != nil {
+		return errors.WithMessagef(err, "failed storing bindings")
 	}
-
-	for _, ephemeral := range ephemeralIDs {
-		if err := r.bindingKVS.PutBindings(ctx, longTerm, ephemeral); err != nil {
-			return errors.WithMessagef(err, "failed storing binding of [%s]  to [%s]", ephemeral.UniqueID(), longTerm.UniqueID())
-		}
-	}
-
 	return nil
 }
 

platform/view/services/storage/driver/sql/postgres/binding.go

@@ -40,34 +40,6 @@ func newBindingStore(readDB, writeDB *sql.DB, table string) *BindingStore {
 	}
 }
 
-// func (db *BindingStore) PutBinding(ctx context.Context, ephemeral, longTerm view.Identity) error {
-// 	logger.DebugfContext(ctx, "Put binding for pair [%s:%s]", ephemeral.UniqueID(), longTerm.UniqueID())
-// 	if lt, err := db.GetLongTerm(ctx, longTerm); err != nil {
-// 		return err
-// 	} else if lt != nil && !lt.IsNone() {
-// 		logger.DebugfContext(ctx, "Replacing [%s] with long term [%s]", longTerm.UniqueID(), lt.UniqueID())
-// 		longTerm = lt
-// 	} else {
-// 		logger.DebugfContext(ctx, "Id [%s] is an unregistered long term ID", longTerm.UniqueID())
-// 	}
-// 	query := fmt.Sprintf(`
-// 		INSERT INTO %s (ephemeral_hash, long_term_id)
-// 		VALUES ($1, $2), ($3, $4)
-// 		ON CONFLICT DO NOTHING
-// 		`, db.table)
-// 	logger.Debug(query, ephemeral.UniqueID(), longTerm.UniqueID())
-// 	_, err := db.writeDB.ExecContext(ctx, query, ephemeral.UniqueID(), longTerm, longTerm.UniqueID(), longTerm)
-// 	if err == nil {
-// 		logger.DebugfContext(ctx, "Long-term and ephemeral ids registered [%s,%s]", longTerm, ephemeral)
-// 		return nil
-// 	}
-// 	if errors.Is(db.errorWrapper.WrapError(err), driver.UniqueKeyViolation) {
-// 		logger.Infof("tuple [%s,%s] already in db. Skipping...", ephemeral, longTerm)
-// 		return nil
-// 	}
-// 	return errors.Wrapf(err, "failed executing query [%s]", query)
-// }
-
 func (db *BindingStore) PutBindings(ctx context.Context, longTerm view.Identity, ephemeral ...view.Identity) error {
 	if len(ephemeral) == 0 {
 		return errors.New("no ephemeral identities provided")