Merge pull request #689 from sergey-shilov/txn-refactoring

Fix tests.

Author: ashcherbakov

plenum/common/stack_manager.py

@@ -120,7 +120,7 @@ def _parse_pool_transaction_file(
                 try:
                     # TODO: Need to handle abbreviated verkey
                     key_type = 'verkey'
-                    verkey = cryptonymToHex(txn_data[TARGET_NYM])
+                    verkey = cryptonymToHex(str(txn_data[TARGET_NYM]))
                     key_type = 'identifier'
                     cryptonymToHex(get_from(txn))
                 except ValueError:

plenum/test/node_request/test_timestamp/test_3pc_timestamp.py

@@ -6,6 +6,7 @@
     get_timestamp_suspicion_count, make_clock_faulty
 from plenum.test.spy_helpers import getAllReturnVals
 from plenum.test.test_node import getNonPrimaryReplicas
+from plenum.common.txn_util import get_txn_time
 
 from plenum.test.helper import sdk_send_random_and_check
 
@@ -41,8 +42,8 @@ def test_replicas_prepare_time(looper, txnPoolNodeSet, sdk_pool_handle, sdk_wall
                 for iv in node.txn_seq_range_to_3phase_key[DOMAIN_LEDGER_ID]:
                     three_pc_key = iv.data
                     for seq_no in range(iv.begin, iv.end):
-                        assert node.domainLedger.getBySeqNo(
-                            seq_no)[TXN_TIME] == pp_coll[three_pc_key].ppTime
+                        assert get_txn_time(node.domainLedger.getBySeqNo(seq_no))\
+                               == pp_coll[three_pc_key].ppTime
 
 
 def test_non_primary_accepts_pre_prepare_time(looper, txnPoolNodeSet,

plenum/test/test_dirty_read.py

@@ -45,6 +45,6 @@ def test_dirty_read(looper, txnPoolNodeSet, sdk_pool_handle, sdk_wallet_client):
     request = sdk_sign_and_send_prepared_request(looper, sdk_wallet_client,
                                                  sdk_pool_handle, req)
     received_replies = sdk_get_and_check_replies(looper, [request])
-    results = [str(get_payload_data(reply[1]['result'][DATA])) for reply in received_replies]
+    results = [str(get_payload_data(reply['result'][DATA])) for _, reply in received_replies]
 
     assert len(set(results)) == 1