From 148a188f8fcb20e3160ee5b5e2342672c6528eb9 Mon Sep 17 00:00:00 2001
From: andrei <deffuls@debian-BULLSEYE-live-builder-AMD64>
Date: Mon, 25 Apr 2022 15:16:24 +0300
Subject: [PATCH] fixed test_core.py by adding HDict in saved_key_orders
 function

---
 planetmint/backend/tarantool/transaction/tools.py | 7 ++++---
 tests/tendermint/test_core.py                     | 1 -
 tests/upsert_validator/conftest.py                | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/planetmint/backend/tarantool/transaction/tools.py b/planetmint/backend/tarantool/transaction/tools.py
index de83b3c..31243bf 100644
--- a/planetmint/backend/tarantool/transaction/tools.py
+++ b/planetmint/backend/tarantool/transaction/tools.py
@@ -1,10 +1,11 @@
 from secrets import token_hex
 import copy
+from planetmint.common.memoize import HDict
 
 
 def _save_keys_order(dictionary):
     filter_keys = ["asset", "metadata"]
-    if type(dictionary) is dict:
+    if type(dictionary) is dict or type(dictionary) is HDict:
         keys = list(dictionary.keys())
         _map = {}
         for key in keys:
@@ -35,7 +36,6 @@ class TransactionDecompose:
             "metadata": None,
             "asset": None
         }
-        # print(f"Transaction ::::: {self._transaction}")
 
     def get_map(self, dictionary: dict = None):
 
@@ -115,10 +115,11 @@ class TransactionDecompose:
         return _keys, _outputs
 
     def __prepare_transaction(self):
+        _map = self.get_map()
         return (self._transaction["id"],
                 self._transaction["operation"],
                 self._transaction["version"],
-                self.get_map())
+                _map)
 
     def convert_to_tuple(self):
         self._metadata_check()
diff --git a/tests/tendermint/test_core.py b/tests/tendermint/test_core.py
index d3ec6dd..dd77d9c 100644
--- a/tests/tendermint/test_core.py
+++ b/tests/tendermint/test_core.py
@@ -293,7 +293,6 @@ def test_deliver_tx__double_spend_fails(a, b, init_chain_request):
 
     app.end_block(types.RequestEndBlock(height=99))
     app.commit()
-
     assert b.get_transaction(tx.id).id == tx.id
     result = app.deliver_tx(encode_tx_to_bytes(tx))
     assert result.code == CodeTypeError
diff --git a/tests/upsert_validator/conftest.py b/tests/upsert_validator/conftest.py
index ea932c8..cd0d1a3 100644
--- a/tests/upsert_validator/conftest.py
+++ b/tests/upsert_validator/conftest.py
@@ -7,7 +7,6 @@ from unittest.mock import patch
 import pytest
 
 from planetmint.backend import query
-# from planetmint.backend.localmongodb import query
 from planetmint.upsert_validator import ValidatorElection
 
 
@@ -46,6 +45,3 @@ def inconclusive_election(b, ongoing_validator_election, new_validator):
     query.store_validator_set(b.connection, validator_update)
     return ongoing_validator_election
 
-
-# ERROR tests/upsert_validator/test_validator_election.py::test_get_status_concluded - AttributeError: 'TarantoolDB' object has no attribute 'run'
-# ERROR tests/upsert_validator/test_validator_election.py::test_get_status_inconclusive - AttributeError: 'TarantoolDB' object has no attribute 'run'