refactor: rework hashing of ...tools / ToolsRepository

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/model/bom.py

@@ -295,8 +295,7 @@ def __eq__(self, other: object) -> bool:
     def __hash__(self) -> int:
         return hash((
             tuple(self.authors), self.component, tuple(self.licenses), self.manufacture, tuple(self.properties),
-            self.supplier, self.timestamp, tuple(self.tools.tools), tuple(self.tools.components),
-            tuple(self.tools.services), self.manufacturer,
+            self.supplier, self.timestamp, self.tools, self.manufacturer,
         ))
 
     def __repr__(self) -> str:

cyclonedx/model/tool.py

@@ -260,6 +260,9 @@ def __eq__(self, other: object) -> bool:
             and self._components == other._components \
             and self._services == other._services
 
+    def __hash__(self):
+        return hash((tuple(self._tools), tuple(self._components), tuple(self._services)))
+
 
 class ToolsRepositoryHelper(BaseHelper):
     """

cyclonedx/model/vulnerability.py

@@ -1332,8 +1332,7 @@ def __hash__(self) -> int:
         return hash((
             self.id, self.source, tuple(self.references), tuple(self.ratings), tuple(self.cwes), self.description,
             self.detail, self.recommendation, self.workaround, tuple(self.advisories), self.created, self.published,
-            self.updated, self.credits, tuple(self.tools.tools), tuple(self.tools.components),
-            tuple(self.tools.services), self.analysis, tuple(self.affects), tuple(self.properties)
+            self.updated, self.credits, self.tools, self.analysis, tuple(self.affects), tuple(self.properties)
         ))
 
     def __repr__(self) -> str: