chore: add HasAnyLeaseForNodeByProvider method in lease module

Author: ironman0x7b2

x/lease/keeper/lease.go

@@ -137,6 +137,20 @@ func (k *Keeper) IterateLeasesForNodeByProvider(ctx sdk.Context, nodeAddr base.N
 	}
 }
 
+// HasAnyLeaseForNodeByProvider checks if any lease exists for a given node-provider pair.
+func (k *Keeper) HasAnyLeaseForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress) bool {
+	exists := false
+
+	k.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, func(_ int, _ v1.Lease) bool {
+		exists = true
+
+		// stop iteration after finding the first lease
+		return true
+	})
+
+	return exists
+}
+
 // IterateLeasesForNode iterates over all leases for a specific node and calls the provided function for each lease.
 // The iteration stops when the provided function returns 'true' or an error occurs.
 func (k *Keeper) IterateLeasesForNode(ctx sdk.Context, addr base.NodeAddress, fn func(int, v1.Lease) (bool, error)) error {

x/lease/keeper/msg_handler.go

@@ -263,15 +263,7 @@ func (k *Keeper) HandleMsgStartLease(ctx sdk.Context, msg *v1.MsgStartLeaseReque
 	}
 
 	// Check if a lease already exists between this provider and node
-	leaseExists := false
-
-	k.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, func(_ int, _ v1.Lease) bool {
-		leaseExists = true
-
-		return true
-	})
-
-	if leaseExists {
+	if k.HasAnyLeaseForNodeByProvider(ctx, nodeAddr, provAddr) {
 		return nil, types.NewErrorDuplicateLease(nodeAddr, provAddr)
 	}
 

x/plan/keeper/alias.go

@@ -12,8 +12,8 @@ func (k *Keeper) GetLease(ctx sdk.Context, id uint64) (leasetypes.Lease, bool) {
 	return k.lease.GetLease(ctx, id)
 }
 
-func (k *Keeper) IterateLeasesForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress, fn func(index int, item leasetypes.Lease) (stop bool)) {
-	k.lease.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, fn)
+func (k *Keeper) HasAnyLeaseForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress) bool {
+	return k.lease.HasAnyLeaseForNodeByProvider(ctx, nodeAddr, provAddr)
 }
 
 func (k *Keeper) GetNode(ctx sdk.Context, addr base.NodeAddress) (nodetypes.Node, bool) {

x/plan/keeper/expected.go

@@ -20,7 +20,7 @@ type BankKeeper interface {
 
 type LeaseKeeper interface {
 	GetLease(ctx sdk.Context, id uint64) (leasetypes.Lease, bool)
-	IterateLeasesForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress, fn func(index int, item leasetypes.Lease) (stop bool))
+	HasAnyLeaseForNodeByProvider(ctx sdk.Context, nodeAddr base.NodeAddress, provAddr base.ProvAddress) bool
 }
 
 type NodeKeeper interface {

x/plan/keeper/msg_handler.go

@@ -5,7 +5,6 @@ import (
 
 	base "github.com/sentinel-official/sentinelhub/v12/types"
 	v1base "github.com/sentinel-official/sentinelhub/v12/types/v1"
-	"github.com/sentinel-official/sentinelhub/v12/x/lease/types/v1"
 	"github.com/sentinel-official/sentinelhub/v12/x/plan/types"
 	"github.com/sentinel-official/sentinelhub/v12/x/plan/types/v3"
 	subscriptiontypes "github.com/sentinel-official/sentinelhub/v12/x/subscription/types/v3"
@@ -99,15 +98,7 @@ func (k *Keeper) HandleMsgLinkNode(ctx sdk.Context, msg *v3.MsgLinkNodeRequest)
 	}
 
 	// Ensure an active lease exists between the node and provider
-	leaseExists := false
-
-	k.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, func(_ int, _ v1.Lease) bool {
-		leaseExists = true
-
-		return true
-	})
-
-	if !leaseExists {
+	if !k.HasAnyLeaseForNodeByProvider(ctx, nodeAddr, provAddr) {
 		return nil, types.NewErrorLeaseForNodeByProviderNotFound(nodeAddr, provAddr)
 	}