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

fixed some minor bugs

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2022-04-12 15:47:39 +02:00
parent 828d2202a6
commit 73ce3ec861
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,8 @@ def delete_transactions(connection, txn_ids: list):
@register_query(TarantoolDB) @register_query(TarantoolDB)
def store_pre_commit_state(connection, state: dict): def store_pre_commit_state(connection, state: dict):
space = connection.space("pre_commits") space = connection.space("pre_commits")
if not space:
return {}
_precommit = space.select(state["height"], index="height_search", limit=1) _precommit = space.select(state["height"], index="height_search", limit=1)
unique_id = token_hex(8) if (len(_precommit.data) == 0) else _precommit.data[0][0] unique_id = token_hex(8) if (len(_precommit.data) == 0) else _precommit.data[0][0]
space.upsert((unique_id, state["height"], state["transactions"]), space.upsert((unique_id, state["height"], state["transactions"]),
@ -453,7 +455,7 @@ def get_election(connection, election_id: str):
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("transactions") space = connection.space("assets")
_transactions = space.select([asset_id], index="only_asset_search") _transactions = space.select([asset_id], index="only_asset_search")
_transactions = _transactions.data _transactions = _transactions.data
_keys = _keys.data _keys = _keys.data

11
tests/commands/conftest.py
View File

@ -4,9 +4,9 @@
# Code is Apache-2.0 and docs are CC-BY-4.0 # Code is Apache-2.0 and docs are CC-BY-4.0
from argparse import Namespace from argparse import Namespace
import pytest import pytest
from planetmint.config import Config
@pytest.fixture @pytest.fixture
def mock_run_configure(monkeypatch): def mock_run_configure(monkeypatch):
@ -39,10 +39,11 @@ def mock_generate_key_pair(monkeypatch):
@pytest.fixture @pytest.fixture
def mock_planetmint_backup_config(monkeypatch): def mock_planetmint_backup_config(monkeypatch):
config = { _config = Config().get()
'database': {'host': 'host', 'port': 12345, 'name': 'adbname'}, _config['database']['host']='host'
} _config['database']['port']=12345
monkeypatch.setattr('planetmint._config', config) _config['database']['name']='adbname'
Config().set( _config )
@pytest.fixture @pytest.fixture

10
tests/commands/test_commands.py
View File

@ -27,7 +27,7 @@ def test_make_sure_we_dont_remove_any_command():
parser = create_parser() parser = create_parser()
assert parser.parse_args(['configure', 'localmongodb']).command assert parser.parse_args(['configure', 'tarantool_db']).command
assert parser.parse_args(['show-config']).command assert parser.parse_args(['show-config']).command
assert parser.parse_args(['init']).command assert parser.parse_args(['init']).command
assert parser.parse_args(['drop']).command assert parser.parse_args(['drop']).command
@ -73,6 +73,8 @@ def test_bigchain_show_config(capsys):
_, _ = capsys.readouterr() _, _ = capsys.readouterr()
run_show_config(args) run_show_config(args)
output_config = json.loads(capsys.readouterr()[0]) output_config = json.loads(capsys.readouterr()[0])
sorted_output_config = json.dumps(output_config, indent=4, sort_keys=True)
print( f"config : {sorted_output_config}")
# Note: This test passed previously because we were always # Note: This test passed previously because we were always
# using the default configuration parameters, but since we # using the default configuration parameters, but since we
# are running with docker-compose now and expose parameters like # are running with docker-compose now and expose parameters like
@ -82,8 +84,10 @@ def test_bigchain_show_config(capsys):
# and run_show_config updates the planetmint.config # and run_show_config updates the planetmint.config
from planetmint.config import Config from planetmint.config import Config
_config = Config().get() _config = Config().get()
del _config['CONFIGURED'] sorted_config = json.dumps(_config, indent=4, sort_keys=True)
assert output_config == _config print( f"_config : {sorted_config}")
#del sorted_config['CONFIGURED']
assert sorted_output_config == sorted_config
def test__run_init(mocker): def test__run_init(mocker):