From b438efa4a46238765474857312ff6bbb48c10166 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Thu, 28 Jan 2016 20:09:36 +0100
Subject: [PATCH] Display back confirmations in wot tabs
---
src/sakia/core/graph/base_graph.py | 6 +++---
src/sakia/core/net/network.py | 9 ++++++---
src/sakia/tests/unit/core/graph/test_base_graph.py | 10 ++--------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/sakia/core/graph/base_graph.py b/src/sakia/core/graph/base_graph.py
index ee6443ba..6da6f618 100644
--- a/src/sakia/core/graph/base_graph.py
+++ b/src/sakia/core/graph/base_graph.py
@@ -56,7 +56,7 @@ class BaseGraph(QObject):
node_status += NodeStatus.OUT
return node_status
- async def confirmation_text(self, block_number):
+ def confirmation_text(self, block_number):
"""
Build confirmation text of an arc
:param int block_number: the block number of the certification
@@ -107,7 +107,7 @@ class BaseGraph(QObject):
QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
),
'cert_time': certifier['cert_time'],
- 'confirmation_text': (await self.confirmation_text(certifier['cert_time']))
+ 'confirmation_text': self.confirmation_text(certifier['block_number'])
}
self.nx_graph.add_edge(certifier['identity'].pubkey, identity.pubkey, attr_dict=arc, weight=len(certifier_list))
@@ -145,7 +145,7 @@ class BaseGraph(QObject):
QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
),
'cert_time': certified['cert_time'],
- 'confirmation_text': (await self.confirmation_text(certified['cert_time']))
+ 'confirmation_text': self.confirmation_text(certified['block_number'])
}
self.nx_graph.add_edge(identity.pubkey, certified['identity'].pubkey, attr_dict=arc,
diff --git a/src/sakia/core/net/network.py b/src/sakia/core/net/network.py
index ebaea66b..320bc435 100644
--- a/src/sakia/core/net/network.py
+++ b/src/sakia/core/net/network.py
@@ -274,9 +274,12 @@ class Network(QObject):
:return: the number of confirmations of a data
:rtype: int
"""
- if block_number > self.current_blockid.number:
- raise ValueError("Could not compute confirmations : data block number is after current block")
- return self.current_blockid.number - block_number + 1
+ if block_number:
+ if block_number > self.current_blockid.number:
+ raise ValueError("Could not compute confirmations : data block number is after current block")
+ return self.current_blockid.number - block_number + 1
+ else:
+ return 0
def add_node(self, node):
"""
diff --git a/src/sakia/tests/unit/core/graph/test_base_graph.py b/src/sakia/tests/unit/core/graph/test_base_graph.py
index 56e40553..f7a3bbdd 100644
--- a/src/sakia/tests/unit/core/graph/test_base_graph.py
+++ b/src/sakia/tests/unit/core/graph/test_base_graph.py
@@ -76,10 +76,7 @@ class TestBaseGraph(unittest.TestCase, QuamashTest):
base_graph = BaseGraph(app, community)
- async def exec_test():
- self.assertEquals((await base_graph.confirmation_text(200)), "2/6")
-
- self.lp.run_until_complete(exec_test())
+ self.assertEquals(base_graph.confirmation_text(200), "2/6")
@patch('sakia.core.Application')
@patch('sakia.core.Community')
@@ -89,10 +86,7 @@ class TestBaseGraph(unittest.TestCase, QuamashTest):
base_graph = BaseGraph(app, community)
- async def exec_test():
- self.assertEquals((await base_graph.confirmation_text(200)), "33 %")
-
- self.lp.run_until_complete(exec_test())
+ self.assertEquals(base_graph.confirmation_text(200), "33 %")
@patch('sakia.core.Community')
@patch('sakia.core.Application')
--
GitLab