Skip to content
Snippets Groups Projects
Commit f3ed05c7 authored by inso's avatar inso
Browse files

Handle None block in network

parent c1d5f420
No related branches found
No related tags found
No related merge requests found
...@@ -301,7 +301,7 @@ class Account(QObject): ...@@ -301,7 +301,7 @@ class Account(QObject):
elif not result[0]: elif not result[0]:
result = (False, (yield from r.text())) result = (False, (yield from r.text()))
else: else:
yield from r.text() yield from r.release()
return result return result
@asyncio.coroutine @asyncio.coroutine
...@@ -336,7 +336,7 @@ class Account(QObject): ...@@ -336,7 +336,7 @@ class Account(QObject):
elif not result[0]: elif not result[0]:
result = (False, (yield from r.text())) result = (False, (yield from r.text()))
else: else:
yield from r.text() yield from r.release()
return result return result
@asyncio.coroutine @asyncio.coroutine
...@@ -373,7 +373,7 @@ class Account(QObject): ...@@ -373,7 +373,7 @@ class Account(QObject):
elif not result[0]: elif not result[0]:
result = (False, (yield from r.text())) result = (False, (yield from r.text()))
else: else:
yield from r.text() yield from r.release()
return result return result
@asyncio.coroutine @asyncio.coroutine
...@@ -409,7 +409,7 @@ class Account(QObject): ...@@ -409,7 +409,7 @@ class Account(QObject):
elif not result[0]: elif not result[0]:
result = (False, (yield from r.text())) result = (False, (yield from r.text()))
else: else:
yield from r.text() yield from r.release()
return result return result
def start_coroutines(self): def start_coroutines(self):
......
...@@ -295,7 +295,7 @@ class Node(QObject): ...@@ -295,7 +295,7 @@ class Node(QObject):
block_data = yield from bma.blockchain.Current(conn_handler).get() block_data = yield from bma.blockchain.Current(conn_handler).get()
block_hash = block_data['hash'] block_hash = block_data['hash']
if block_hash != self.block['hash']: if not self.block or block_hash != self.block['hash']:
self.set_block(block_data) self.set_block(block_data)
logging.debug("Changed block {0} -> {1}".format(self.block['number'], logging.debug("Changed block {0} -> {1}".format(self.block['number'],
block_data['number'])) block_data['number']))
......
...@@ -166,8 +166,11 @@ class NetworkTableModel(QAbstractTableModel): ...@@ -166,8 +166,11 @@ class NetworkTableModel(QAbstractTableModel):
port = node.endpoint.port port = node.endpoint.port
is_root = self.community.network.is_root_node(node) is_root = self.community.network.is_root_node(node)
if node.block:
return (address, port, node.block['number'], node.block['hash'], node.uid, number, block_hash = node.block['number'], node.block['hash']
else:
number, block_hash = "", ""
return (address, port, number, block_hash, node.uid,
is_member, node.pubkey, node.software, node.version, is_root, node.state) is_member, node.pubkey, node.software, node.version, is_root, node.state)
@asyncify @asyncify
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment