fix(deployment): anyOf ignored when allOf present (#936)

fix copy-paste in anyOf test Signed-off-by: Artur Troian <troian.ap@gmail.com>
akash-network · Nov 27, 2020 · 703711d · 703711d
1 parent 116eaba
commit 703711d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/x/deployment/types/types.go b/x/deployment/types/types.go
@@ -89,12 +89,15 @@ func (g GroupSpec) MatchRequirements(provider []atypes.Provider) bool {
 			}
 		}
 
-		for _, validator := range g.Requirements.SignedBy.AnyOf {
-			if existingAttr, exists := existingRequirements[validator]; exists {
-				if types.AttributesSubsetOf(g.Requirements.Attributes, existingAttr) {
+		if len(g.Requirements.SignedBy.AnyOf) != 0 {
+			for _, validator := range g.Requirements.SignedBy.AnyOf {
+				if existingAttr, exists := existingRequirements[validator]; exists &&
+					types.AttributesSubsetOf(g.Requirements.Attributes, existingAttr) {
 					return true
 				}
 			}
+
+			return false
 		}
 
 		return true

diff --git a/x/deployment/types/types_test.go b/x/deployment/types/types_test.go
@@ -228,7 +228,7 @@ func TestGroupPlacementRequirementsSignerAnyOf(t *testing.T) {
 		OrderBidDuration: types.DefaultOrderBiddingDuration,
 	}
 
-	group.Requirements.SignedBy.AllOf = append(group.Requirements.SignedBy.AllOf, "validator1")
+	group.Requirements.SignedBy.AnyOf = append(group.Requirements.SignedBy.AnyOf, "validator1")
 
 	providerAttr := []atypes.Provider{
 		{