Skip to content

Commit 21c8f8b

Browse files
rhofirAtosrhofirAtos
committed
refactor: Update test files for indy-vdr migration - Change request building functions from async to sync to align with indy-vdr API
Signed-off-by: MoulayHicham <rhofirjob@gmail.com>
1 parent c86e343 commit 21c8f8b

File tree

5 files changed

+388
-73
lines changed

5 files changed

+388
-73
lines changed

‎plenum/test/audit_ledger/test_audit_ledger_multiple_ledgers_in_one_batch.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
2727
indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
2828

2929
# Convert indy-vdr Request to plenum Request
30-
req_dict = json.loads(indy_vdr_req.body)
30+
req_dict = indy_vdr_req.as_dict
3131
nym_req = PlenumRequest(
3232
identifier=req_dict.get('identifier'),
3333
reqId=req_dict.get('reqId'),
@@ -50,7 +50,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
5050
indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
5151

5252
# Convert indy-vdr Request to plenum Request
53-
req_dict2 = json.loads(indy_vdr_req2.body)
53+
req_dict2 = indy_vdr_req2.as_dict
5454
pool_config_req = PlenumRequest(
5555
identifier=req_dict2.get('identifier'),
5656
reqId=req_dict2.get('reqId'),
@@ -87,7 +87,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
8787
indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
8888

8989
# Convert indy-vdr Request to plenum Request
90-
req_dict = json.loads(indy_vdr_req.body)
90+
req_dict = indy_vdr_req.as_dict
9191
nym_req = PlenumRequest(
9292
identifier=req_dict.get('identifier'),
9393
reqId=req_dict.get('reqId'),
@@ -108,7 +108,7 @@ def test_audit_ledger_multiple_ledgers_in_one_batch(txnPoolNodeSet, looper, sdk_
108108
indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
109109

110110
# Convert indy-vdr Request to plenum Request
111-
req_dict2 = json.loads(indy_vdr_req2.body)
111+
req_dict2 = indy_vdr_req2.as_dict
112112
pool_config_req = PlenumRequest(
113113
identifier=req_dict2.get('identifier'),
114114
reqId=req_dict2.get('reqId'),
@@ -151,7 +151,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
151151
indy_vdr_req = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj])[0]
152152

153153
# Convert indy-vdr Request to plenum Request
154-
req_dict = json.loads(indy_vdr_req.body)
154+
req_dict = indy_vdr_req.as_dict
155155
nym_req = PlenumRequest(
156156
identifier=req_dict.get('identifier'),
157157
reqId=req_dict.get('reqId'),
@@ -172,7 +172,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
172172
indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
173173

174174
# Convert indy-vdr Request to plenum Request
175-
req_dict2 = json.loads(indy_vdr_req2.body)
175+
req_dict2 = indy_vdr_req2.as_dict
176176
pool_config_req = PlenumRequest(
177177
identifier=req_dict2.get('identifier'),
178178
reqId=req_dict2.get('reqId'),
@@ -202,7 +202,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
202202
indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
203203

204204
# Convert indy-vdr Request to plenum Request
205-
req_dict2 = json.loads(indy_vdr_req2.body)
205+
req_dict2 = indy_vdr_req2.as_dict
206206
node_req = PlenumRequest(
207207
identifier=req_dict2.get('identifier'),
208208
reqId=req_dict2.get('reqId'),
@@ -223,7 +223,7 @@ def test_multiple_ledgers_in_second_batch_apply_first_time(txnPoolNodeSet, loope
223223
indy_vdr_req2 = sdk_sign_request_objects(looper, sdk_wallet_trustee, [req_obj2])[0]
224224

225225
# Convert indy-vdr Request to plenum Request
226-
req_dict2 = json.loads(indy_vdr_req2.body)
226+
req_dict2 = indy_vdr_req2.as_dict
227227
pool_config_req = PlenumRequest(
228228
identifier=req_dict2.get('identifier'),
229229
reqId=req_dict2.get('reqId'),

‎plenum/test/audit_ledger/test_audit_multiple_uncommitted_node_regs.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from plenum.test.delayers import cDelay, icDelay
2-
from plenum.test.node_catchup.helper import ensure_all_nodes_have_same_data
2+
from plenum.test.node_catchup.helper import ensure_all_nodes_have_same_data, check_master_pp_seq_nos_are_equal
33
from plenum.test.node_request.helper import sdk_ensure_pool_functional
44
from plenum.test.stasher import delay_rules, start_delaying
55
from plenum.test.view_change.helper import add_new_node
6+
from stp_core.loop.eventually import eventually
67

78

89
def test_audit_multiple_uncommitted_node_regs(looper, tdir, tconf, allPluginsPath,

0 commit comments

Comments
 (0)