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

Implement new written field

parent 76716cc2
No related branches found
No related tags found
No related merge requests found
...@@ -266,11 +266,17 @@ class Identity(QObject): ...@@ -266,11 +266,17 @@ class Identity(QObject):
BlockchainState.VALIDATED, BlockchainState.VALIDATED,
community) community)
certifier['cert_time'] = certifier_data['cert_time']['medianTime'] certifier['cert_time'] = certifier_data['cert_time']['medianTime']
if 'written' in certifier_data and certifier_data['written'] and 'number' in certifier_data['written']:
certifier['block_number'] = certifier_data['written']['number']
else:
certifier['block_number'] = certifier_data['cert_time']['block'] certifier['block_number'] = certifier_data['cert_time']['block']
certifiers.append(certifier) certifiers.append(certifier)
except ValueError as e: except ValueError as e:
if '404' in str(e): if '404' in str(e):
logging.debug('bma.wot.CertifiersOf request error: {0}'.format(str(e))) logging.debug('bma.wot.CertifiersOf request error: {0}'.format(str(e)))
else:
logging.debug(str(e))
except NoPeerAvailable as e: except NoPeerAvailable as e:
logging.debug(str(e)) logging.debug(str(e))
...@@ -311,12 +317,11 @@ class Identity(QObject): ...@@ -311,12 +317,11 @@ class Identity(QObject):
# add only valid certification... # add only valid certification...
try: try:
cert_expired = yield from community.certification_expired(certifier['cert_time']) cert_expired = yield from community.certification_expired(certifier['cert_time'])
if cert_expired:
continue
except NoPeerAvailable: except NoPeerAvailable:
logging.debug("No peer available") logging.debug("No peer available")
continue cert_expired = True
if not cert_expired:
# keep only the latest certification # keep only the latest certification
already_found = [c['identity'].pubkey for c in unique_valid] already_found = [c['identity'].pubkey for c in unique_valid]
if certifier['identity'].pubkey in already_found: if certifier['identity'].pubkey in already_found:
...@@ -348,6 +353,9 @@ class Identity(QObject): ...@@ -348,6 +353,9 @@ class Identity(QObject):
BlockchainState.VALIDATED, BlockchainState.VALIDATED,
community) community)
certified['cert_time'] = certified_data['cert_time']['medianTime'] certified['cert_time'] = certified_data['cert_time']['medianTime']
if 'written' in certified_data and certified_data['written'] and 'number' in certified_data['written']:
certified['block_number'] = certified_data['written']['number']
else:
certified['block_number'] = certified_data['cert_time']['block'] certified['block_number'] = certified_data['cert_time']['block']
certified_list.append(certified) certified_list.append(certified)
except ValueError as e: except ValueError as e:
...@@ -387,12 +395,11 @@ class Identity(QObject): ...@@ -387,12 +395,11 @@ class Identity(QObject):
# add only valid certification... # add only valid certification...
try: try:
cert_expired = yield from community.certification_expired(certified['cert_time']) cert_expired = yield from community.certification_expired(certified['cert_time'])
if cert_expired:
continue
except NoPeerAvailable: except NoPeerAvailable:
logging.debug("No peer available") logging.debug("No peer available")
continue cert_expired = True
if not cert_expired:
# keep only the latest certification # keep only the latest certification
already_found = [c['identity'].pubkey for c in unique_valid] already_found = [c['identity'].pubkey for c in unique_valid]
if certified['identity'].pubkey in already_found: if certified['identity'].pubkey in already_found:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment