Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-11-24 22:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_validator passing

Browse Source
This commit is contained in:
andrei 2022-04-25 14:56:00 +03:00
parent 58982c2fcf
commit 255d1ee49a
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,15 +117,15 @@ def get_metadata(connection, transaction_ids: list):
@register_query(TarantoolDB) @register_query(TarantoolDB)
# asset: {"id": "asset_id"} # asset: {"id": "asset_id"}
# asset: {"data": any} -> insert (tx_id, asset["data"]). # asset: {"data": any} -> insert (tx_id, asset["data"]).
#def store_asset(connection, asset: dict, tx_id=None): # def store_asset(connection, asset: dict, tx_id=None):
def store_asset(connection, asset: dict): def store_asset(connection, asset: dict):
space = connection.space("assets") space = connection.space("assets")
# print(f"DATA store asset: {asset}") # print(f"DATA store asset: {asset}")
try: try:
space.insert( asset ) space.insert(asset)
#if tx_id is not None: # if tx_id is not None:
# space.insert((asset, tx_id, tx_id)) # space.insert((asset, tx_id, tx_id))
#else: # else:
# space.insert((asset, str(asset["id"]), str(asset["id"]))) # TODO Review this function # space.insert((asset, str(asset["id"]), str(asset["id"]))) # TODO Review this function
except: # TODO Add Raise For Duplicate except: # TODO Add Raise For Duplicate
print("DUPLICATE ERROR") print("DUPLICATE ERROR")
@ -136,9 +136,9 @@ def store_assets(connection, assets: list):
space = connection.space("assets") space = connection.space("assets")
for asset in assets: for asset in assets:
try: try:
space.insert( asset ) space.insert(asset)
except Exception as ex: # TODO Raise ERROR for Duplicate except Exception as ex: # TODO Raise ERROR for Duplicate
print( f"EXCEPTION : {ex} ") print(f"EXCEPTION : {ex} ")
@register_query(TarantoolDB) @register_query(TarantoolDB)
@ -175,7 +175,7 @@ def get_latest_block(connection): # TODO Here is used DESCENDING OPERATOR
hash = '' hash = ''
heigth = 0 heigth = 0
txs = [] txs = []
if len(_all_blocks ) > 0: if len(_all_blocks) > 0:
_block = sorted(_all_blocks, key=itemgetter(1))[0] _block = sorted(_all_blocks, key=itemgetter(1))[0]
space = connection.space("blocks_tx") space = connection.space("blocks_tx")
_txids = space.select(_block[2], index="block_search") _txids = space.select(_block[2], index="block_search")
@ -391,10 +391,9 @@ def get_pre_commit_state(connection):
return {} return {}
@register_query(TarantoolDB) @register_query(TarantoolDB)
def store_validator_set(connection, validators_update: dict): def store_validator_set(conn, validators_update: dict):
space = connection.space("validators") space = conn.space("validators")
_validator = space.select(validators_update["height"], index="height_search", limit=1) _validator = space.select(validators_update["height"], index="height_search", limit=1)
unique_id = token_hex(8) if (len(_validator.data) == 0) else _validator.data[0][0] unique_id = token_hex(8) if (len(_validator.data) == 0) else _validator.data[0][0]
space.upsert((unique_id, validators_update["height"], validators_update["validators"]), space.upsert((unique_id, validators_update["height"], validators_update["validators"]),
@ -465,11 +464,11 @@ def get_election(connection, election_id: str):
@register_query(TarantoolDB) @register_query(TarantoolDB)
def get_asset_tokens_for_public_key(connection, asset_id: str, public_key: str): def get_asset_tokens_for_public_key(connection, asset_id: str, public_key: str):
space = connection.space("keys") space = connection.space("keys")
#_keys = space.select([public_key], index="keys_search") # _keys = space.select([public_key], index="keys_search")
space = connection.space("assets") space = connection.space("assets")
_transactions = space.select([asset_id], index="assetid_search") _transactions = space.select([asset_id], index="assetid_search")
#_transactions = _transactions # _transactions = _transactions
#_keys = _keys.data # _keys = _keys.data
_grouped_transactions = _group_transaction_by_ids(connection=connection, txids=[_tx[1] for _tx in _transactions]) _grouped_transactions = _group_transaction_by_ids(connection=connection, txids=[_tx[1] for _tx in _transactions])
return _grouped_transactions return _grouped_transactions

7
tests/upsert_validator/conftest.py
View File

@ -6,7 +6,8 @@ from unittest.mock import patch
import pytest import pytest
from planetmint.backend.localmongodb import query from planetmint.backend import query
# from planetmint.backend.localmongodb import query
from planetmint.upsert_validator import ValidatorElection from planetmint.upsert_validator import ValidatorElection
@ -44,3 +45,7 @@ def inconclusive_election(b, ongoing_validator_election, new_validator):
query.store_validator_set(b.connection, validator_update) query.store_validator_set(b.connection, validator_update)
return ongoing_validator_election return ongoing_validator_election
# ERROR tests/upsert_validator/test_validator_election.py::test_get_status_concluded - AttributeError: 'TarantoolDB' object has no attribute 'run'
# ERROR tests/upsert_validator/test_validator_election.py::test_get_status_inconclusive - AttributeError: 'TarantoolDB' object has no attribute 'run'