Make FIPS cert_id an int.

4 files changed, 29 insertions, 31 deletions

diff --git a/src/sec_certs/dataset/fips.py b/src/sec_certs/dataset/fips.py
index 6f8eff3e..68d027d0 100644
--- a/src/sec_certs/dataset/fips.py
+++ b/src/sec_certs/dataset/fips.py
@@ -211,7 +211,7 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial
             if cert_id not in cert_ids:
                 cert_ids.add(cert_id)
 
-        return [FIPSCertificate(cert_id) for cert_id in cert_ids]
+        return [FIPSCertificate(int(cert_id)) for cert_id in cert_ids]
 
     @classmethod
     def from_web_latest(cls) -> FIPSDataset:
@@ -284,7 +284,7 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial
 
     def _compute_transitive_vulnerabilities(self) -> None:
         logger.info("Computing heuristics: Computing transitive vulnerabilities in referenc(ed/ing) certificates.")
-        transitive_cve_finder = TransitiveVulnerabilityFinder(lambda cert: cert.cert_id)
+        transitive_cve_finder = TransitiveVulnerabilityFinder(lambda cert: str(cert.cert_id))
         transitive_cve_finder.fit(self.certs, lambda cert: cert.heuristics.policy_processed_references)
 
         for dgst in self.certs:
@@ -309,12 +309,12 @@ class FIPSDataset(Dataset[FIPSCertificate, FIPSAuxillaryDatasets], ComplexSerial
 
         policy_reference_finder = ReferenceFinder()
         policy_reference_finder.fit(
-            self.certs, lambda cert: cert.cert_id, lambda cert: cert.heuristics.policy_prunned_references
+            self.certs, lambda cert: str(cert.cert_id), lambda cert: cert.heuristics.policy_prunned_references
         )
 
         module_reference_finder = ReferenceFinder()
         module_reference_finder.fit(
-            self.certs, lambda cert: cert.cert_id, lambda cert: cert.heuristics.module_prunned_references
+            self.certs, lambda cert: str(cert.cert_id), lambda cert: cert.heuristics.module_prunned_references
         )
 
         for cert in self:
diff --git a/src/sec_certs/sample/fips.py b/src/sec_certs/sample/fips.py
index f93bf33b..b3ff8ba6 100644
--- a/src/sec_certs/sample/fips.py
+++ b/src/sec_certs/sample/fips.py
@@ -499,7 +499,7 @@ class FIPSCertificate(
 
     def __init__(
         self,
-        cert_id: str,
+        cert_id: int,
         web_data: FIPSCertificate.WebData | None = None,
         pdf_data: FIPSCertificate.PdfData | None = None,
         heuristics: FIPSCertificate.Heuristics | None = None,
@@ -680,9 +680,7 @@ class FIPSCertificate(
             2. Consider only ids s.t. they don't appear in self.heuristics.algorithms
             3. Consider only ids s.t. they don't appear in self.pdf_data.keywords["fips_certlike"]["Certlike"]
         """
-        prunned = {x for x in attribute_to_prune if x != self.cert_id}
+        prunned = {x for x in attribute_to_prune if x != str(self.cert_id)}
         prunned = {x for x in prunned if int(x) > config.always_false_positive_fips_cert_id_threshold}
         prunned = {x for x in prunned if x not in self.heuristics.algorithm_numbers}
         return {x for x in prunned if x not in self.pdf_data.certlike_algorithm_numbers}
-
-        return prunned
diff --git a/tests/data/fips/certificate/fictional_cert.json b/tests/data/fips/certificate/fictional_cert.json
index a1dbec54..9ec36238 100644
--- a/tests/data/fips/certificate/fictional_cert.json
+++ b/tests/data/fips/certificate/fictional_cert.json
@@ -1,7 +1,7 @@
 {
     "_type": "sec_certs.sample.fips.FIPSCertificate",
     "dgst": "184097a88a9b4ad9",
-    "cert_id": "3518",
+    "cert_id": 3518,
     "web_data": {
         "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
         "module_name": null,
diff --git a/tests/data/fips/dataset/toy_dataset.json b/tests/data/fips/dataset/toy_dataset.json
index 37853ff9..f21872f2 100644
--- a/tests/data/fips/dataset/toy_dataset.json
+++ b/tests/data/fips/dataset/toy_dataset.json
@@ -17,7 +17,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "69d9200c309f5f97",
-            "cert_id": "2590",
+            "cert_id": 2590,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -101,7 +101,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "3b05cf67849835e3",
-            "cert_id": "2997",
+            "cert_id": 2997,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -185,7 +185,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "618102f275d5649a",
-            "cert_id": "3495",
+            "cert_id": 3495,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -269,7 +269,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "5b00a7bb92c1cb19",
-            "cert_id": "2721",
+            "cert_id": 2721,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -353,7 +353,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "e1ff7d9997726782",
-            "cert_id": "3090",
+            "cert_id": 3090,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -437,7 +437,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "ed16d272044ed81f",
-            "cert_id": "2860",
+            "cert_id": 2860,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -521,7 +521,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "73e7f3f802b0e919",
-            "cert_id": "3176",
+            "cert_id": 3176,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -605,7 +605,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "756a6524cdb2d4ea",
-            "cert_id": "3850",
+            "cert_id": 3850,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -689,7 +689,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "0e8b7a7f79b3098b",
-            "cert_id": "2665",
+            "cert_id": 2665,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -773,7 +773,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "f7df34ce0a0ad316",
-            "cert_id": "3093",
+            "cert_id": 3093,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -857,7 +857,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "0df59fd6c41cadd2",
-            "cert_id": "3711",
+            "cert_id": 3711,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -941,7 +941,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "24a05f4d1305d667",
-            "cert_id": "3493",
+            "cert_id": 3493,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1025,7 +1025,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "51c94a510b50e68f",
-            "cert_id": "3141",
+            "cert_id": 3141,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1109,7 +1109,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "75ca28395bfc9ad1",
-            "cert_id": "2630",
+            "cert_id": 2630,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1193,7 +1193,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "cd0666cdd7ce0244",
-            "cert_id": "3095",
+            "cert_id": 3095,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1277,7 +1277,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "ceab64951a30f684",
-            "cert_id": "3197",
+            "cert_id": 3197,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1361,7 +1361,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "0ab77c56eece2d24",
-            "cert_id": "3651",
+            "cert_id": 3651,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1445,7 +1445,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "9ca7b8be590113b8",
-            "cert_id": "2711",
+            "cert_id": 2711,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1529,7 +1529,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "184097a88a9b4ad9",
-            "cert_id": "3518",
+            "cert_id": 3518,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1613,7 +1613,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "c333a75353784177",
-            "cert_id": "2779",
+            "cert_id": 2779,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1697,7 +1697,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "ad1e075215267a28",
-            "cert_id": "2441",
+            "cert_id": 2441,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,
@@ -1781,7 +1781,7 @@
         {
             "_type": "sec_certs.sample.fips.FIPSCertificate",
             "dgst": "2aec3694418f35d8",
-            "cert_id": "3488",
+            "cert_id": 3488,
             "web_data": {
                 "_type": "sec_certs.sample.fips.FIPSCertificate.WebData",
                 "module_name": null,