From 9518774d9e1ab3dee8edac307dae16517006d703 Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Sat, 22 Aug 2015 23:23:39 +0200 Subject: [PATCH] Fix multiple bugs --- src/cutecoin/core/graph.py | 4 ++-- src/cutecoin/core/net/api/bma/access.py | 1 + src/cutecoin/core/txhistory.py | 2 +- src/cutecoin/gui/wot_tab.py | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cutecoin/core/graph.py b/src/cutecoin/core/graph.py index a192d6d0..1665d83f 100644 --- a/src/cutecoin/core/graph.py +++ b/src/cutecoin/core/graph.py @@ -90,11 +90,11 @@ class Graph(object): if node['id'] in tuple(done): continue identity_selected = identity.from_handled_data(node['text'], node['id'], BlockchainState.VALIDATED) - certifier_list = identity_selected.certifiers_of(self.app.identities_registry, self.community) + certifier_list = identity_selected.unique_valid_certifiers_of(self.app.identities_registry, self.community) self.add_certifier_list(certifier_list, identity_selected, identity) if identity.pubkey in tuple(self._graph.keys()): return False - certified_list = identity_selected.certified_by(self.app.identities_registry, self.community) + certified_list = identity_selected.unique_valid_certified_by(self.app.identities_registry, self.community) self.add_certified_list(certified_list, identity_selected, identity) if identity.pubkey in tuple(self._graph.keys()): return False diff --git a/src/cutecoin/core/net/api/bma/access.py b/src/cutecoin/core/net/api/bma/access.py index 5c48b0fb..b77dd961 100644 --- a/src/cutecoin/core/net/api/bma/access.py +++ b/src/cutecoin/core/net/api/bma/access.py @@ -1,5 +1,6 @@ from PyQt5.QtCore import QObject, pyqtSlot from PyQt5.QtNetwork import QNetworkReply +from . import wot from . import blockchain, ConnectionHandler from .....tools.exceptions import NoPeerAvailable from ..... import __version__ diff --git a/src/cutecoin/core/txhistory.py b/src/cutecoin/core/txhistory.py index a268190b..24d993d0 100644 --- a/src/cutecoin/core/txhistory.py +++ b/src/cutecoin/core/txhistory.py @@ -173,7 +173,7 @@ class TxHistory(): if tx.state in (Transfer.AWAITING, Transfer.VALIDATING)] +\ [ud['block_number'] for ud in self._dividends if ud['state'] in (Transfer.AWAITING, Transfer.VALIDATING)] +\ - [self.latest_block] + [max(0, self.latest_block - community.network.fork_window(community.members_pubkeys()))] parsed_block = min(set(blocks)) logging.debug("Refresh from : {0} to {1}".format(self.latest_block, current_block['number'])) dividends_data = qtbma.ud.History.null_value diff --git a/src/cutecoin/gui/wot_tab.py b/src/cutecoin/gui/wot_tab.py index 597c9904..744b5a34 100644 --- a/src/cutecoin/gui/wot_tab.py +++ b/src/cutecoin/gui/wot_tab.py @@ -87,8 +87,8 @@ class WotTabWidget(QWidget, Ui_WotTabWidget): identity.inner_data_changed.connect(self.handle_identity_change) # create Identity from node metadata - certifier_list = identity.certifiers_of(self.app.identities_registry, self.community) - certified_list = identity.certified_by(self.app.identities_registry, self.community) + certifier_list = identity.unique_valid_certifiers_of(self.app.identities_registry, self.community) + certified_list = identity.unique_valid_certified_by(self.app.identities_registry, self.community) # create empty graph instance graph = Graph(self.app, self.community) -- GitLab