Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-25 15:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for error NoneType

Browse Source
This commit is contained in:
andrei 2022-05-31 17:33:33 +03:00
parent 4d1815c4c4
commit 4819fccb59
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
planetmint/backend/tarantool/query.py
View File

@ -115,8 +115,9 @@ def get_metadata(connection, transaction_ids: list):
metadata = connection.run( metadata = connection.run(
connection.space("meta_data").select(_id, index="id_search") connection.space("meta_data").select(_id, index="id_search")
) )
if metadata is not None or len(metadata) > 0: if metadata is not None:
_returned_data.append(metadata) if len(metadata) > 0:
_returned_data.append(metadata)
return _returned_data if len(_returned_data) > 0 else None return _returned_data if len(_returned_data) > 0 else None
@ -178,16 +179,17 @@ def get_latest_block(connection): # TODO Here is used DESCENDING OPERATOR
) )
block = {"app_hash": '', "height": 0, "transactions": []} block = {"app_hash": '', "height": 0, "transactions": []}
if len(_all_blocks) > 0: if _all_blocks is not None:
_block = sorted(_all_blocks, key=itemgetter(1), reverse=True)[0] if len(_all_blocks) > 0:
_txids = connection.run( _block = sorted(_all_blocks, key=itemgetter(1), reverse=True)[0]
connection.space("blocks_tx").select(_block[2], index="block_search") _txids = connection.run(
) connection.space("blocks_tx").select(_block[2], index="block_search")
block["app_hash"] = _block[0] )
block["height"] = _block[1] block["app_hash"] = _block[0]
block["transactions"] = [tx[0] for tx in _txids] block["height"] = _block[1]
else: block["transactions"] = [tx[0] for tx in _txids]
block = None else:
block = None
return block return block
@ -475,13 +477,14 @@ def get_validator_set(connection, height: int = None):
_validators = connection.run( _validators = connection.run(
connection.space("validators").select() connection.space("validators").select()
) )
if height is not None: if height is not None and _validators is not None:
_validators = [{"height": validator[1], "validators": validator[2]} for validator in _validators if _validators = [{"height": validator[1], "validators": validator[2]} for validator in _validators if
validator[1] <= height] validator[1] <= height]
return next(iter(sorted(_validators, key=lambda k: k["height"], reverse=True)), None) return next(iter(sorted(_validators, key=lambda k: k["height"], reverse=True)), None)
else: elif _validators is not None:
_validators = [{"height": validator[1], "validators": validator[2]} for validator in _validators] _validators = [{"height": validator[1], "validators": validator[2]} for validator in _validators]
return next(iter(sorted(_validators, key=lambda k: k["height"], reverse=True)), None) return next(iter(sorted(_validators, key=lambda k: k["height"], reverse=True)), None)
return None
@register_query(TarantoolDBConnection) @register_query(TarantoolDBConnection)