CNS-362: re-apply all the changes in the original CNS-362 branch

.golangci.yml

@@ -65,7 +65,7 @@ issues:
 
 linters-settings:
   dogsled:
-    max-blank-identifiers: 3
+    max-blank-identifiers: 5
   maligned:
     # print struct with more effective memory layout or not, false by default
     suggest-new: true

x/conflict/keeper/msg_server_detection_test.go

@@ -31,9 +31,10 @@ func setupForConflictTests(t *testing.T, numOfProviders int) testStruct {
 	// init keepers state
 	var balance int64 = 100000
 
+	// setup consumer
 	ts.consumer = common.CreateNewAccount(ts.ctx, *ts.keepers, balance)
 
-	// setup consumer
+	// setup providers
 	for i := 0; i < numOfProviders; i++ {
 		ts.Providers = append(ts.Providers, common.CreateNewAccount(ts.ctx, *ts.keepers, balance))
 	}

x/pairing/keeper/pairing.go

@@ -161,14 +161,24 @@ func (k Keeper) getProjectStrictestPolicy(ctx sdk.Context, project projectstypes
 	}
 
 	planPolicy := plan.GetPlanPolicy()
-	policies := []*projectstypes.Policy{project.AdminPolicy, project.SubscriptionPolicy, &planPolicy}
+	policies := []*projectstypes.Policy{&planPolicy}
+	if project.SubscriptionPolicy != nil {
+		policies = append(policies, project.SubscriptionPolicy)
+	}
+	if project.AdminPolicy != nil {
+		policies = append(policies, project.AdminPolicy)
+	}
+
 	if !projectstypes.CheckChainIdExistsInPolicies(chainID, policies) {
 		return 0, 0, "", 0, fmt.Errorf("chain ID not found in any of the policies")
 	}
 
 	geolocation := k.CalculateEffectiveGeolocationFromPolicies(policies)
 
 	providersToPair := k.CalculateEffectiveProvidersToPairFromPolicies(policies)
+	if providersToPair == uint64(math.MaxUint64) {
+		return 0, 0, "", 0, fmt.Errorf("could not calculate providersToPair value: all policies are nil")
+	}
 
 	sub, found := k.subscriptionKeeper.GetSubscription(ctx, project.GetSubscription())
 	if !found {
@@ -194,15 +204,16 @@ func (k Keeper) CalculateEffectiveGeolocationFromPolicies(policies []*projectsty
 }
 
 func (k Keeper) CalculateEffectiveProvidersToPairFromPolicies(policies []*projectstypes.Policy) uint64 {
-	var providersToPairValues []uint64
+	providersToPair := uint64(math.MaxUint64)
 
 	for _, policy := range policies {
-		if policy != nil {
-			providersToPairValues = append(providersToPairValues, policy.GetMaxProvidersToPair())
+		val := policy.GetMaxProvidersToPair()
+		if policy != nil && val < providersToPair {
+			providersToPair = val
 		}
 	}
 
-	return commontypes.FindMin(providersToPairValues)
+	return providersToPair
 }
 
 func (k Keeper) CalculateEffectiveAllowedCuPerEpochFromPolicies(policies []*projectstypes.Policy, cuUsedInProject uint64, cuLeftInSubscription uint64) uint64 {