refactor: Update test files for indy-vdr migration - Change request building functions from async to sync to align with indy-vdr API

Author: rhofirAtos

plenum/test/audit_ledger/test_audit_ledger_multiple_ledgers_in_one_batch.py

@@ -27,7 +27,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
     indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict = json.loads(indy_vdr_req.body)
+    req_dict = indy_vdr_req.as_dict
     nym_req = PlenumRequest(
         identifier=req_dict.get('identifier'),
         reqId=req_dict.get('reqId'),
@@ -50,7 +50,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
     indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict2 = json.loads(indy_vdr_req2.body)
+    req_dict2 = indy_vdr_req2.as_dict
     pool_config_req = PlenumRequest(
         identifier=req_dict2.get('identifier'),
         reqId=req_dict2.get('reqId'),
@@ -87,7 +87,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
     indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict = json.loads(indy_vdr_req.body)
+    req_dict = indy_vdr_req.as_dict
     nym_req = PlenumRequest(
         identifier=req_dict.get('identifier'),
         reqId=req_dict.get('reqId'),
@@ -108,7 +108,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
     indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict2 = json.loads(indy_vdr_req2.body)
+    req_dict2 = indy_vdr_req2.as_dict
     pool_config_req = PlenumRequest(
         identifier=req_dict2.get('identifier'),
         reqId=req_dict2.get('reqId'),
@@ -151,7 +151,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
     indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict = json.loads(indy_vdr_req.body)
+    req_dict = indy_vdr_req.as_dict
     nym_req = PlenumRequest(
         identifier=req_dict.get('identifier'),
         reqId=req_dict.get('reqId'),
@@ -172,7 +172,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
     indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict2 = json.loads(indy_vdr_req2.body)
+    req_dict2 = indy_vdr_req2.as_dict
     pool_config_req = PlenumRequest(
         identifier=req_dict2.get('identifier'),
         reqId=req_dict2.get('reqId'),
@@ -202,7 +202,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
     indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict2 = json.loads(indy_vdr_req2.body)
+    req_dict2 = indy_vdr_req2.as_dict
     node_req = PlenumRequest(
         identifier=req_dict2.get('identifier'),
         reqId=req_dict2.get('reqId'),
@@ -223,7 +223,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
     indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
 
     # Convert indy-vdr Request to plenum Request
-    req_dict2 = json.loads(indy_vdr_req2.body)
+    req_dict2 = indy_vdr_req2.as_dict
     pool_config_req = PlenumRequest(
         identifier=req_dict2.get('identifier'),
         reqId=req_dict2.get('reqId'),

plenum/test/audit_ledger/test_audit_multiple_uncommitted_node_regs.py

@@ -1,8 +1,9 @@
 from plenum.test.delayers import cDelay, icDelay
-from plenum.test.node_catchup.helper import ensure_all_nodes_have_same_data
+from plenum.test.node_catchup.helper import ensure_all_nodes_have_same_data, check_master_pp_seq_nos_are_equal
 from plenum.test.node_request.helper import sdk_ensure_pool_functional
 from plenum.test.stasher import delay_rules, start_delaying
 from plenum.test.view_change.helper import add_new_node
+from stp_core.loop.eventually import eventually
 
 
 def test_audit_multiple_uncommitted_node_regs(looper, tdir, tconf, allPluginsPath,