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

Merge pull request #135 from andreitricolici/planetmint-tarantool

Browse Source 
Fixed test_txlist.py
This commit is contained in:
Lorenz Herzberger 2022-06-08 16:45:00 +02:00 committed by GitHub
commit 36d9b41d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,13 +60,11 @@ def store_transactions(connection, signed_transactions: list):
) )
except: # This is used for omitting duplicate error in database for test -> test_bigchain_api::test_double_inclusion except: # This is used for omitting duplicate error in database for test -> test_bigchain_api::test_double_inclusion
continue continue
for _in in txtuples["inputs"]: for _in in txtuples["inputs"]:
connection.run( connection.run(
connection.space("inputs").insert(_in), connection.space("inputs").insert(_in),
only_data=False only_data=False
) )
for _out in txtuples["outputs"]: for _out in txtuples["outputs"]:
connection.run( connection.run(
connection.space("outputs").insert(_out), connection.space("outputs").insert(_out),

2
planetmint/backend/tarantool/transaction/tools.py
View File

@ -69,6 +69,7 @@ class TransactionDecompose:
_inputs = [] _inputs = []
input_index = 0 input_index = 0
for _input in self._transaction["inputs"]: for _input in self._transaction["inputs"]:
_inputs.append((self._transaction["id"], _inputs.append((self._transaction["id"],
_input["fulfillment"], _input["fulfillment"],
_input["owners_before"], _input["owners_before"],
@ -84,7 +85,6 @@ class TransactionDecompose:
_keys = [] _keys = []
output_index = 0 output_index = 0
for _output in self._transaction["outputs"]: for _output in self._transaction["outputs"]:
# print(f"\noutput: {_output}")
output_id = self.__create_hash(7) output_id = self.__create_hash(7)
if _output["condition"]["details"].get("subconditions") is None: if _output["condition"]["details"].get("subconditions") is None:
tmp_output = (self._transaction["id"], tmp_output = (self._transaction["id"],

4
tests/utils.py
View File

@ -41,6 +41,10 @@ def flush_tarantool_db(connection, dbname):
connection.run(connection.space(s).delete(_id[1]), only_data=False) connection.run(connection.space(s).delete(_id[1]), only_data=False)
elif s in ["blocks", "abci_chains"]: 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))
elif s == "outputs":
connection.run(connection.space(s).delete(_id[-4], only_data=False))
else: else:
connection.run(connection.space(s).delete(_id[0], only_data=False)) connection.run(connection.space(s).delete(_id[0], only_data=False))