refactor: Renamed function names

2 files changed, 15 insertions, 14 deletions

diff --git a/sec_certs/dataset/common_criteria.py b/sec_certs/dataset/common_criteria.py
index a05b341e..a0cf55c9 100644
--- a/sec_certs/dataset/common_criteria.py
+++ b/sec_certs/dataset/common_criteria.py
@@ -690,7 +690,7 @@ class CCDataset(Dataset[CommonCriteriaCert], ComplexSerializableType):
         cve_dependency_finder.fit()
 
         for dgst in self.certs:
-            dependency_cve = cve_dependency_finder.get_dependency_cve(dgst)
+            dependency_cve = cve_dependency_finder.get_dependency_vulnerabilities(dgst)
             self.certs[dgst].heuristics.direct_dependency_cves = dependency_cve.direct_dependency_cves
             self.certs[dgst].heuristics.indirect_dependency_cves = dependency_cve.indirect_dependency_cves
 
diff --git a/sec_certs/model/dependency_vulnerability_finder.py b/sec_certs/model/dependency_vulnerability_finder.py
index 9bed05b0..b2580891 100644
--- a/sec_certs/model/dependency_vulnerability_finder.py
+++ b/sec_certs/model/dependency_vulnerability_finder.py
@@ -27,7 +27,7 @@ class DependencyVulnerabilityFinder:
         self.vulnerabilities: Vulnerabilities = {}
         self.certificates = certificates
 
-    def _get_dataset_cert_ids(self) -> Dict[str, int]:
+    def _get_dataset_cert_ids_occurrences(self) -> Dict[str, int]:
         cert_id_occurrences: Dict[str, int] = {}
 
         for dgst in self.certificates:
@@ -40,7 +40,7 @@ class DependencyVulnerabilityFinder:
 
         return cert_id_occurrences
 
-    def _get_dependency_cves(self, dgst: str, dependency_type: DependencyType) -> Optional[Set[str]]:
+    def _get_cert_dependency_cves(self, dgst: str, dependency_type: DependencyType) -> Optional[Set[str]]:
         dependency_type_dict = {
             DependencyType.DIRECT: self.certificates[dgst].heuristics.report_references.directly_referenced_by,
             DependencyType.INDIRECT: self.certificates[dgst].heuristics.report_references.indirectly_referenced_by,
@@ -52,7 +52,7 @@ class DependencyVulnerabilityFinder:
             return None
 
         vulnerabilities = set()
-        dataset_cert_id_occurrences = self._get_dataset_cert_ids()
+        dataset_cert_id_occurrences = self._get_dataset_cert_ids_occurrences()
 
         for cert_id in references:
             if cert_id is None:
@@ -65,15 +65,16 @@ class DependencyVulnerabilityFinder:
 
             for dgst in self.certificates:
                 cert_obj = self.certificates[dgst]
+                cert_obj_cves = cert_obj.heuristics.related_cves
 
-                if cert_obj.heuristics.cert_id == cert_id and cert_obj.heuristics.related_cves:
-                    vulnerabilities.update(cert_obj.heuristics.related_cves)
+                if cert_obj.heuristics.cert_id == cert_id and cert_obj_cves:
+                    vulnerabilities.update(cert_obj_cves)
 
         return vulnerabilities if vulnerabilities else None
 
     def fit(self) -> Vulnerabilities:
-        cert_id_occurrences = self._get_dataset_cert_ids()
-        thrown_away_counter = 0
+        cert_id_occurrences = self._get_dataset_cert_ids_occurrences()
+        thrown_away_cert_counter = 0
 
         for dgst in self.certificates:
             cert_id = self.certificates[dgst].heuristics.cert_id
@@ -82,23 +83,23 @@ class DependencyVulnerabilityFinder:
                 continue
 
             if cert_id_occurrences[cert_id] >= 2:
-                thrown_away_counter += 1
+                thrown_away_cert_counter += 1
                 continue
 
             self.vulnerabilities[dgst] = {}
-            self.vulnerabilities[dgst][DependencyType.DIRECT.value] = self._get_dependency_cves(
+            self.vulnerabilities[dgst][DependencyType.DIRECT.value] = self._get_cert_dependency_cves(
                 dgst, DependencyType.DIRECT
             )
-            self.vulnerabilities[dgst][DependencyType.INDIRECT.value] = self._get_dependency_cves(
+            self.vulnerabilities[dgst][DependencyType.INDIRECT.value] = self._get_cert_dependency_cves(
                 dgst, DependencyType.INDIRECT
             )
 
-        if thrown_away_counter > 0:
-            logging.warning("There were total of %s certificates skipped due to duplicity", thrown_away_counter)
+        if thrown_away_cert_counter > 0:
+            logging.warning("There were total of %s certificates skipped due to duplicity", thrown_away_cert_counter)
 
         return self.vulnerabilities
 
-    def get_dependency_cve(self, dgst: str) -> DependencyCVE:
+    def get_dependency_vulnerabilities(self, dgst: str) -> DependencyCVE:
         if not self.vulnerabilities.get(dgst):
             return DependencyCVE(direct_dependency_cves=None, indirect_dependency_cves=None)