From 09efa319c058510ede636068ad61c1e872137d0f Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 9 Jun 2022 10:41:46 +0300 Subject: [PATCH 1/4] Small fixes in .upsert() functions for tarantool_db --- planetmint/backend/tarantool/connection.py | 3 +-- planetmint/backend/tarantool/query.py | 24 +++++++--------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/planetmint/backend/tarantool/connection.py b/planetmint/backend/tarantool/connection.py index 73db49b..06ff3bc 100644 --- a/planetmint/backend/tarantool/connection.py +++ b/planetmint/backend/tarantool/connection.py @@ -16,7 +16,7 @@ logger = logging.getLogger(__name__) class TarantoolDBConnection(Connection): - def __init__(self, host: str = "localhost", port: int = 3303, user: str = None, password: str = None, **kwargs): + def __init__(self, host: str = "localhost", port: int = 3303, user: str = None, password: str = None, **kwargs): try: super().__init__(**kwargs) self.host = host @@ -62,7 +62,6 @@ class TarantoolDBConnection(Connection): except tarantool.error.NetworkError as net_error: raise net_error - def get_connection(self): return self.conn diff --git a/planetmint/backend/tarantool/query.py b/planetmint/backend/tarantool/query.py index 83f4c1d..f302c3f 100644 --- a/planetmint/backend/tarantool/query.py +++ b/planetmint/backend/tarantool/query.py @@ -390,11 +390,11 @@ def store_pre_commit_state(connection, state: dict): _precommit = connection.run( connection.space("pre_commits").select([], limit=1) ) - _precommitTuple = (token_hex(8), state["height"], state["transactions"]) if _precommit is None or len(_precommit) == 0 else _precommit[0] + _precommitTuple = (token_hex(8), state["height"], state["transactions"]) if _precommit is None or len( + _precommit) == 0 else _precommit[0] connection.run( connection.space("pre_commits").upsert(_precommitTuple, - op_list=[('=', 0, _precommitTuple[0]), - ('=', 1, state["height"]), + op_list=[('=', 1, state["height"]), ('=', 2, state["transactions"])], limit=1), only_data=False @@ -420,8 +420,7 @@ def store_validator_set(conn, validators_update: dict): unique_id = token_hex(8) if _validator is None or len(_validator) == 0 else _validator[0][0] conn.run( conn.space("validators").upsert((unique_id, validators_update["height"], validators_update["validators"]), - op_list=[('=', 0, unique_id), - ('=', 1, validators_update["height"]), + op_list=[('=', 1, validators_update["height"]), ('=', 2, validators_update["validators"])], limit=1), only_data=False @@ -444,8 +443,7 @@ def delete_validator_set(connection, height: int): def store_election(connection, election_id: str, height: int, is_concluded: bool): connection.run( connection.space("elections").upsert((election_id, height, is_concluded), - op_list=[('=', 0, election_id), - ('=', 1, height), + op_list=[('=', 1, height), ('=', 2, is_concluded)], limit=1), only_data=False @@ -517,16 +515,8 @@ def get_asset_tokens_for_public_key(connection, asset_id: str, @register_query(TarantoolDBConnection) def store_abci_chain(connection, height: int, chain_id: str, is_synced: bool = True): - _chain = connection.run(connection.space("abci_chains").select(height, index="height_search", limit=1)) - _chainTuple = (height, is_synced, chain_id) if _chain is None or len(_chain) == 0 else _chain[0] - connection.run( - connection.space("abci_chains").upsert(_chainTuple, - op_list=[('=', 0, height), - ('=', 1, is_synced), - ('=', 2, chain_id)], - limit=1), - only_data=False - ) + connection.run(connection.space("abci_chains").delete(chain_id), only_data=False) + connection.run(connection.space("abci_chains").insert((height, is_synced, chain_id)), only_data=False) @register_query(TarantoolDBConnection) From 06b1244ca5db3dee1dd4770cc1d26cdcaa30bddb Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 9 Jun 2022 13:57:59 +0300 Subject: [PATCH 2/4] Fixed flush_tarantool_db Function. --- tests/utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/utils.py b/tests/utils.py index 08b16b8..1dc9806 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -40,13 +40,15 @@ def flush_tarantool_db(connection, dbname): if "assets" == s: connection.run(connection.space(s).delete(_id[1]), only_data=False) elif s in ["blocks", "abci_chains"]: - connection.run(connection.space(s).delete(_id[2], only_data=False)) + connection.run(connection.space(s).delete(_id[2]), only_data=False) elif s == "inputs": - connection.run(connection.space(s).delete(_id[-2], only_data=False)) + connection.run(connection.space(s).delete(_id[-2]), only_data=False) elif s == "outputs": - connection.run(connection.space(s).delete(_id[-4], only_data=False)) + connection.run(connection.space(s).delete(_id[-4]), only_data=False) + elif s == "utxos": + connection.run(connection.space(s).delete([_id[0], _id[1]]), only_data=False) else: - connection.run(connection.space(s).delete(_id[0], only_data=False)) + connection.run(connection.space(s).delete(_id[0]), only_data=False) def generate_block(planet): From dd5060aeba997686487bee5028d7cbdab39220c6 Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 9 Jun 2022 17:17:23 +0300 Subject: [PATCH 3/4] added utxos to SPACE_NAMES to delete data from utxo space --- planetmint/backend/schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planetmint/backend/schema.py b/planetmint/backend/schema.py index 0a4a34c..7204ea8 100644 --- a/planetmint/backend/schema.py +++ b/planetmint/backend/schema.py @@ -22,7 +22,7 @@ TABLES = ('transactions', 'blocks', 'assets', 'metadata', SPACE_NAMES = ("abci_chains", "assets", "blocks", "blocks_tx", "elections", "meta_data", "pre_commits", "validators", - "transactions", "inputs", "outputs", "keys") + "transactions", "inputs", "outputs", "keys", "utxos") VALID_LANGUAGES = ('danish', 'dutch', 'english', 'finnish', 'french', 'german', 'hungarian', 'italian', 'norwegian', 'portuguese', 'romanian', From 0d5791dd50133aedc2fa4a3a5d88387d10c90583 Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 9 Jun 2022 17:21:53 +0300 Subject: [PATCH 4/4] fixed this module by restoring original function instructions. --- tests/tendermint/test_lib.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/tendermint/test_lib.py b/tests/tendermint/test_lib.py index 82f1eea..65994fd 100644 --- a/tests/tendermint/test_lib.py +++ b/tests/tendermint/test_lib.py @@ -518,11 +518,11 @@ def test_get_spent_key_order(b, user_pk, user_sk, user2_pk, user2_sk): bob = generate_key_pair() tx1 = Create.generate([user_pk], - [([alice.public_key], 3), ([user_pk], 2)], - asset=None) \ + [([alice.public_key], 3), ([user_pk], 2)], + asset=None) \ .sign([user_sk]) b.store_bulk_transactions([tx1]) - assert tx1.validate(b) + inputs = tx1.to_inputs() tx2 = Transfer.generate([inputs[1]], [([user2_pk], 2)], tx1.id).sign([user_sk]) assert tx2.validate(b)