From 24716d41ba4d363217d51f5f27e83280b6422873 Mon Sep 17 00:00:00 2001
From: andrei <deffuls@debian-BULLSEYE-live-builder-AMD64>
Date: Wed, 23 Feb 2022 13:45:50 +0200
Subject: [PATCH] reformated config

---
 planetmint/__init__.py                  | 22 ++++++++++------------
 tests/backend/tarantool/test_queries.py |  2 +-
 tests/conftest.py                       |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/planetmint/__init__.py b/planetmint/__init__.py
index 60978c6..72850bd 100644
--- a/planetmint/__init__.py
+++ b/planetmint/__init__.py
@@ -42,10 +42,6 @@ _database_tarantool = {
 }
 _database_tarantool.update(_base_database_tarantool_local_db)
 
-_database_map = {
-    'tarantool_db': _database_tarantool,
-}
-
 init_config = {
     "init_file": "init_db.txt",
     "relative_path": "backend/tarantool/"
@@ -55,7 +51,16 @@ drop_config = {
     "drop_file": "drop_db.txt",
     "relative_path": "backend/tarantool/"
 }
-
+_database_map = {
+    'tarantool_db': _database_tarantool,
+    "ctl_config": {
+        "login": "admin",
+        "host": "admin:pass@127.0.0.1:3301",
+        "service": "tarantoolctl connect",
+        "init_config": init_config,
+        "drop_config": drop_config
+    },
+}
 config = {
     'server': {
         # Note: this section supports all the Gunicorn settings:
@@ -65,13 +70,6 @@ config = {
             log_config['handlers']['console']['level']).lower(),
         'workers': None,  # if None, the value will be cpu_count * 2 + 1
     },
-    "ctl_config": {
-        "login": "admin",
-        "host": "admin:pass@127.0.0.1:3301",
-        "service": "tarantoolctl connect",
-        "init_config": init_config,
-        "drop_config": drop_config
-    },
     'wsserver': {
         'scheme': 'ws',
         'host': 'localhost',
diff --git a/tests/backend/tarantool/test_queries.py b/tests/backend/tarantool/test_queries.py
index 37ba0ca..938b460 100644
--- a/tests/backend/tarantool/test_queries.py
+++ b/tests/backend/tarantool/test_queries.py
@@ -18,7 +18,7 @@ def test_get_txids_filtered(signed_create_tx, signed_transfer_tx):
     from planetmint.backend import connect
     from planetmint.backend.tarantool import query
     from planetmint.models import Transaction
-    conn = connect().get_connection()
+    conn = connect(reset_database=True).get_connection()
     # create and insert two blocks, one for the create and one for the
     # transfer transaction
     create_tx_dict = signed_create_tx.to_dict()
diff --git a/tests/conftest.py b/tests/conftest.py
index 3bcfb8d..726c45b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -113,7 +113,7 @@ def _configure_planetmint(request):
 
 @pytest.fixture(scope='session')
 def _setup_database(_configure_planetmint):  # TODO Here is located setup database
-    from planetmint.backend.connection_tarantool import init_tarantool, drop_tarantool
+    # from planetmint.backend.connection_tarantool import init_tarantool, drop_tarantool
     # print('Initializing test db')
     # init_tarantool()
     # print('Finishing init database')