move cluster internal ratio check to constraints.go

Author: tim-barry

cmd/bootstrap/cmd/constraints.go

@@ -37,3 +37,26 @@ func checkConstraints(partnerNodes, internalNodes []model.NodeInfo) {
 
 	ensureUniformNodeWeightsPerRole(all)
 }
+
+// Check about the number of internal/partner nodes in each cluster. The identites
+// in each cluster do not matter for this check.
+// Each cluster must have >1/3 internal nodes.
+func checkClusterConstraint(clusters flow.ClusterList, partnersInfo []model.NodeInfo, internalsInfo []model.NodeInfo) bool {
+	partners := model.ToIdentityList(partnersInfo)
+	internals := model.ToIdentityList(internalsInfo)
+	for _, cluster := range clusters {
+		var clusterPartnerCount, clusterInternalCount int
+		for _, node := range cluster {
+			if _, exists := partners.ByNodeID(node.NodeID); exists {
+				clusterPartnerCount++
+			}
+			if _, exists := internals.ByNodeID(node.NodeID); exists {
+				clusterInternalCount++
+			}
+		}
+		if clusterInternalCount*2 <= clusterPartnerCount {
+			return false
+		}
+	}
+	return true
+}

cmd/bootstrap/cmd/finalize_test.go

@@ -193,29 +193,6 @@ func TestEpochTimingConfig(t *testing.T) {
 	})
 }
 
-// Check about the number of internal/partner nodes in each cluster. The identites
-// in each cluster do not matter for this check.
-// Each cluster must have >1/3 internal nodes.
-func checkClusterConstraint(clusters flow.ClusterList, partnersInfo []model.NodeInfo, internalsInfo []model.NodeInfo) bool {
-	partners := model.ToIdentityList(partnersInfo)
-	internals := model.ToIdentityList(internalsInfo)
-	for _, cluster := range clusters {
-		var clusterPartnerCount, clusterInternalCount int
-		for _, node := range cluster {
-			if _, exists := partners.ByNodeID(node.NodeID); exists {
-				clusterPartnerCount++
-			}
-			if _, exists := internals.ByNodeID(node.NodeID); exists {
-				clusterInternalCount++
-			}
-		}
-		if clusterInternalCount*2 <= clusterPartnerCount {
-			return false
-		}
-	}
-	return true
-}
-
 func TestMergeNodeInfos(t *testing.T) {
 	partnersLen := 7
 	internalLen := 22