subscription: extract PrincsFilter::eval()

axoflow · Nov 1, 2024 · 59630e8 · 59630e8
1 parent 04d0a83
commit 59630e8
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/common/src/subscription.rs b/common/src/subscription.rs
@@ -265,6 +265,14 @@ impl PrincsFilter {
         })
     }
 
+    pub fn eval(&self, principal: &str) -> bool {
+        match self.operation {
+            None => true,
+            Some(PrincsFilterOperation::Only) => self.princs.contains(principal),
+            Some(PrincsFilterOperation::Except) => !self.princs.contains(principal),
+        }
+    }
+
     pub fn princ_literals(&self) -> &HashSet<String> {
         &self.princs
     }
@@ -811,13 +819,7 @@ impl SubscriptionData {
             return false;
         }
 
-        match self.princs_filter().operation {
-            None => true,
-            Some(PrincsFilterOperation::Only) => self.princs_filter().princ_literals().contains(principal),
-            Some(PrincsFilterOperation::Except) => {
-                !self.princs_filter().princ_literals().contains(principal)
-            }
-        }
+        self.princs_filter().eval(principal)
     }
 
     pub fn revision(&self) -> Option<&String> {