Fixed tests and refactored duplicated request conversion code in test_audit_ledger_multiple_ledgers_in_one_batch.py into a helper function for better maintainability

Signed-off-by: MoulayHicham <rhofirjob@gmail.com>

Author: rhofirAtos

plenum/test/audit_ledger/test_audit_ledger_multiple_ledgers_in_one_batch.py

@@ -8,6 +8,18 @@
 import json
 
 
+def convert_indy_vdr_request_to_plenum(indy_vdr_req):
+    """Helper function to convert indy-vdr Request to plenum Request"""
+    req_dict = indy_vdr_req.as_dict
+    return PlenumRequest(
+        identifier=req_dict.get('identifier'),
+        reqId=req_dict.get('reqId'),
+        operation=req_dict.get('operation'),
+        signature=req_dict.get('signature'),
+        protocolVersion=req_dict.get('protocolVersion')
+    )
+
+
 def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_wallet_trustee, sdk_pool_handle):
     # Checking first case -- first audit txn
     node = txnPoolNodeSet[0]
@@ -27,14 +39,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 = indy_vdr_req.as_dict
-    nym_req = PlenumRequest(
-        identifier=req_dict.get('identifier'),
-        reqId=req_dict.get('reqId'),
-        operation=req_dict.get('operation'),
-        signature=req_dict.get('signature'),
-        protocolVersion=req_dict.get('protocolVersion')
-    )
+    nym_req = convert_indy_vdr_request_to_plenum(indy_vdr_req)
 
     # Apply the request
     node.write_manager.apply_request(nym_req, 10000)
@@ -50,14 +55,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 = indy_vdr_req2.as_dict
-    pool_config_req = PlenumRequest(
-        identifier=req_dict2.get('identifier'),
-        reqId=req_dict2.get('reqId'),
-        operation=req_dict2.get('operation'),
-        signature=req_dict2.get('signature'),
-        protocolVersion=req_dict2.get('protocolVersion')
-    )
+    pool_config_req = convert_indy_vdr_request_to_plenum(indy_vdr_req2)
 
     node.write_manager.apply_request(pool_config_req, 10000)
 
@@ -87,14 +85,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 = indy_vdr_req.as_dict
-    nym_req = PlenumRequest(
-        identifier=req_dict.get('identifier'),
-        reqId=req_dict.get('reqId'),
-        operation=req_dict.get('operation'),
-        signature=req_dict.get('signature'),
-        protocolVersion=req_dict.get('protocolVersion')
-    )
+    nym_req = convert_indy_vdr_request_to_plenum(indy_vdr_req)
 
     node.write_manager.apply_request(nym_req, 10000)
 
@@ -108,14 +99,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 = indy_vdr_req2.as_dict
-    pool_config_req = PlenumRequest(
-        identifier=req_dict2.get('identifier'),
-        reqId=req_dict2.get('reqId'),
-        operation=req_dict2.get('operation'),
-        signature=req_dict2.get('signature'),
-        protocolVersion=req_dict2.get('protocolVersion')
-    )
+    pool_config_req = convert_indy_vdr_request_to_plenum(indy_vdr_req2)
 
     node.write_manager.apply_request(pool_config_req, 10000)
 
@@ -151,14 +135,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 = indy_vdr_req.as_dict
-    nym_req = PlenumRequest(
-        identifier=req_dict.get('identifier'),
-        reqId=req_dict.get('reqId'),
-        operation=req_dict.get('operation'),
-        signature=req_dict.get('signature'),
-        protocolVersion=req_dict.get('protocolVersion')
-    )
+    nym_req = convert_indy_vdr_request_to_plenum(indy_vdr_req)
 
     node.write_manager.apply_request(nym_req, 10000)
 
@@ -172,14 +149,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 = indy_vdr_req2.as_dict
-    pool_config_req = PlenumRequest(
-        identifier=req_dict2.get('identifier'),
-        reqId=req_dict2.get('reqId'),
-        operation=req_dict2.get('operation'),
-        signature=req_dict2.get('signature'),
-        protocolVersion=req_dict2.get('protocolVersion')
-    )
+    pool_config_req = convert_indy_vdr_request_to_plenum(indy_vdr_req2)
 
     node.write_manager.apply_request(pool_config_req, 10000)
 
@@ -202,14 +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 = indy_vdr_req2.as_dict
-    node_req = PlenumRequest(
-        identifier=req_dict2.get('identifier'),
-        reqId=req_dict2.get('reqId'),
-        operation=req_dict2.get('operation'),
-        signature=req_dict2.get('signature'),
-        protocolVersion=req_dict2.get('protocolVersion')
-    )
+    node_req = convert_indy_vdr_request_to_plenum(indy_vdr_req2)
 
     node.write_manager.apply_request(node_req, 10000)
 
@@ -223,14 +186,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 = indy_vdr_req2.as_dict
-    pool_config_req = PlenumRequest(
-        identifier=req_dict2.get('identifier'),
-        reqId=req_dict2.get('reqId'),
-        operation=req_dict2.get('operation'),
-        signature=req_dict2.get('signature'),
-        protocolVersion=req_dict2.get('protocolVersion')
-    )
+    pool_config_req = convert_indy_vdr_request_to_plenum(indy_vdr_req2)
 
     node.write_manager.apply_request(pool_config_req, 10000)
 

plenum/test/helper.py

@@ -829,6 +829,10 @@ def convert_indy_vdr_to_plenum_request(indy_vdr_req):
     Returns:
         A plenum Request object
     """
+    # If it's None, return None or raise an error
+    if indy_vdr_req is None:
+        raise ValueError("Cannot convert None to a plenum Request")
+    
     # If it's already a plenum Request, return it
     if isinstance(indy_vdr_req, Request):
         return indy_vdr_req