From 663e958766ee5c89cbb8141da6aa2e5771765875 Mon Sep 17 00:00:00 2001 From: inso <insomniak.fr@gmaiL.com> Date: Tue, 13 Mar 2018 20:15:35 +0100 Subject: [PATCH] Clean code --- src/sakia/data/graphs/base_graph.py | 28 ---------------------------- src/sakia/data/graphs/wot_graph.py | 6 ++++-- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/sakia/data/graphs/base_graph.py b/src/sakia/data/graphs/base_graph.py index f6355963..a7c4b3c4 100644 --- a/src/sakia/data/graphs/base_graph.py +++ b/src/sakia/data/graphs/base_graph.py @@ -139,34 +139,6 @@ class BaseGraph(QObject): self.nx_graph.add_edge(identity.pubkey, certified.pubkey, attr_dict=arc) - def add_offline_certifier_list(self, certifier_list, identity): - """ - Add list of certifiers to graph - :param List[sakia.data.entities.Certification] certifier_list: List of certified from api - :param sakia.data.entities.Identity identity: identity instance which is certified - :return: - """ - # add certifiers of uid - for certification in tuple(certifier_list): - certifier = self.identities_service.get_identity(certification.certifier) - if certifier: - node_status = self.node_status(certifier) - self.add_certifier_node(certifier, identity, certification, node_status) - - def add_offline_certified_list(self, certified_list, identity): - """ - Add list of certified from api to graph - :param List[sakia.data.entities.Certification] certified_list: List of certified from api - :param identity identity: identity instance which is certifier - :return: - """ - # add certified by uid - for certification in tuple(certified_list): - certified = self.identities_service.get_identity(certification.certified) - if certified: - node_status = self.node_status(certified) - self.add_certified_node(identity, certified, certification, node_status) - def add_certifier_list(self, certifier_list, identity): """ Add list of certifiers to graph diff --git a/src/sakia/data/graphs/wot_graph.py b/src/sakia/data/graphs/wot_graph.py index 5c94e63e..6d18e4b4 100644 --- a/src/sakia/data/graphs/wot_graph.py +++ b/src/sakia/data/graphs/wot_graph.py @@ -44,7 +44,9 @@ class WoTGraph(BaseGraph): # populate graph with certifiers-of certifier_list = self.identities_service.certifications_received(center_identity.pubkey) - self.add_offline_certifier_list(certifier_list, center_identity) + certifier_list = {c: self.identities_service.get_identity(c.certifier) for c in certifier_list} + self.add_certifier_list(certifier_list, center_identity) # populate graph with certified-by certified_list = self.identities_service.certifications_sent(center_identity.pubkey) - self.add_offline_certified_list(certified_list, center_identity) + certified_list = {c: self.identities_service.get_identity(c.certified) for c in certified_list} + self.add_certified_list(certified_list, center_identity) -- GitLab