From acd7d3e5520b8ad6fb5546105b4518bc3fa2e632 Mon Sep 17 00:00:00 2001 From: Sangat Das Date: Fri, 29 Apr 2022 02:41:18 -0700 Subject: [PATCH] Removed all Errors in Make Test Signed-off-by: Sangat Das --- planetmint/backend/tarantool/drop.lua | 1 + planetmint/backend/tarantool/init.lua | 4 ++++ tests/conftest.py | 24 +++++++++++++++--------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/planetmint/backend/tarantool/drop.lua b/planetmint/backend/tarantool/drop.lua index ea5400f..2825f4e 100644 --- a/planetmint/backend/tarantool/drop.lua +++ b/planetmint/backend/tarantool/drop.lua @@ -5,6 +5,7 @@ box.space.blocks_tx:drop() box.space.elections:drop() box.space.meta_data:drop() box.space.pre_commits:drop() +box.space.utxos:drop() box.space.validators:drop() box.space.transactions:drop() box.space.inputs:drop() diff --git a/planetmint/backend/tarantool/init.lua b/planetmint/backend/tarantool/init.lua index d655e8b..4da76c0 100644 --- a/planetmint/backend/tarantool/init.lua +++ b/planetmint/backend/tarantool/init.lua @@ -62,3 +62,7 @@ keys:create_index('id_search', {type = 'hash', parts={'id'}}) keys:create_index('keys_search', {type = 'tree', unique=false, parts={'public_key'}}) keys:create_index('txid_search', {type = 'tree', unique=false, parts={'transaction_id'}}) keys:create_index('output_search', {type = 'tree', unique=false, parts={'output_id'}}) + +utxos = box.schema.space.create('utxos') +utxos:format({{name='transaction_id' , type='string'}, {name='output_index' , type='integer'}}) +utxos:create_index('id_search', {type='hash' , parts={'transaction_id', 'output_index'}}) diff --git a/tests/conftest.py b/tests/conftest.py index c1efc21..53917fa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,6 +18,7 @@ from collections import namedtuple from logging import getLogger from logging.config import dictConfig from planetmint.backend.connection import Connection +from planetmint.backend.tarantool.connection import TarantoolDB import pytest # from pymongo import MongoClient @@ -516,15 +517,19 @@ def unspent_output_2(): def unspent_outputs(unspent_output_0, unspent_output_1, unspent_output_2): return unspent_output_0, unspent_output_1, unspent_output_2 +@pytest.fixture +def tarantool_client(db_context): # TODO Here add TarantoolConnectionClass + return TarantoolDB(host=db_context.host, port=db_context.port) #@pytest.fixture #def mongo_client(db_context): # TODO Here add TarantoolConnectionClass # return None # MongoClient(host=db_context.host, port=db_context.port) # # -#@pytest.fixture -#def utxo_collection(db_context, mongo_client): -# return mongo_client[db_context.name].utxos + +@pytest.fixture +def utxo_collection(tarantool_client): + return tarantool_client.space("utxos") @pytest.fixture @@ -536,12 +541,13 @@ def dummy_unspent_outputs(): ] -#@pytest.fixture -#def utxoset(dummy_unspent_outputs, utxo_collection): -# res = utxo_collection.insert_many(copy.deepcopy(dummy_unspent_outputs)) -# assert res.acknowledged -# assert len(res.inserted_ids) == 3 -# return dummy_unspent_outputs, utxo_collection +@pytest.fixture +def utxoset(dummy_unspent_outputs, utxo_collection): + for utxo in dummy_unspent_outputs: + res = utxo_collection.insert((utxo["transaction_id"], utxo["output_index"])) + assert res + assert len(utxo_collection.select()) == 3 + return dummy_unspent_outputs, utxo_collection @pytest.fixture