Skip to content

Commit 2bec8d6

Browse files
committed
fixed last broken test in signing
- When switching back to SDK reintroduced errors that where fixed in VDR Signed-off-by: Nicholas Massad <nicholasmassad@hotmail.com>
1 parent b923e14 commit 2bec8d6

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

plenum/test/conftest.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
from plenum.test.greek import genNodeNames
4242
from plenum.test.grouped_load_scheduling import GroupedLoadScheduling
4343
from plenum.test.node_catchup.helper import waitNodeDataEquality, check_last_3pc_master
44-
from plenum.test.pool_transactions.helper import vdr_add_new_nym, vdr_pool_refresh, vdr_add_new_steward_and_node
44+
from plenum.test.pool_transactions.helper import vdr_add_new_nym, vdr_pool_refresh, vdr_add_new_steward_and_node, \
45+
sdk_pool_refresh, sdk_add_new_nym, sdk_add_new_steward_and_node
4546
from plenum.test.simulation.sim_random import DefaultSimRandom
4647
from plenum.test.spy_helpers import getAllReturnVals
4748
from plenum.test.view_change.helper import ensure_view_change
@@ -66,7 +67,8 @@
6667
waitForViewChange, requestReturnedToNode, randomText, \
6768
mockDistributions, mockImportModule, chk_all_funcs, \
6869
create_new_test_node, vdr_json_to_request_object, vdr_send_random_requests, \
69-
vdr_get_and_check_replies, vdr_set_protocol_version, vdr_send_random_and_check, MockTimer, create_pool_txn_data, sdk_set_protocol_version
70+
vdr_get_and_check_replies, vdr_set_protocol_version, vdr_send_random_and_check, MockTimer, \
71+
create_pool_txn_data, sdk_set_protocol_version, sdk_send_random_and_check
7072
from plenum.test.node_request.node_request_helper import checkPrePrepared, \
7173
checkPropagated, checkPrepared, checkCommitted
7274
from plenum.test.plugin.helper import getPluginPath
@@ -1368,8 +1370,8 @@ def vdr_node_created_after_some_txns(looper, testNodeClass, do_post_node_creatio
13681370

13691371

13701372
@pytest.fixture(scope="module")
1371-
def vdr_node_set_with_node_advdr_pool_handletxns(
1372-
txnPoolNodeSet, sdk_vdr_pool_handleter_some_txns):
1373+
def vdr_node_set_with_node_added_after_some_txns(
1374+
txnPoolNodeSet, vdr_node_created_after_some_txns):
13731375
looper, new_node, sdk_pool_handle, new_steward_wallet_handle = \
13741376
vdr_node_created_after_some_txns
13751377
txnPoolNodeSet.append(new_node)
@@ -1380,8 +1382,8 @@ def vdr_node_set_with_node_advdr_pool_handletxns(
13801382

13811383
@pytest.fixture(scope="module")
13821384
def vdr_new_node_caught_up(txnPoolNodeSet,
1383-
sdk_node_set_with_node_added_after_some_txns):
1384-
looper, new_node, _, _ = sdk_node_set_with_node_added_after_some_txns
1385+
vdr_node_set_with_node_added_after_some_txns):
1386+
looper, new_node, _, _ = vdr_node_set_with_node_added_after_some_txns
13851387
waitNodeDataEquality(looper, new_node, *txnPoolNodeSet[:4],
13861388
exclude_from_check=['check_last_ordered_3pc_backup'])
13871389
check_last_3pc_master(new_node, txnPoolNodeSet[:4])
@@ -1403,9 +1405,6 @@ def vdr_new_node_caught_up(txnPoolNodeSet,
14031405

14041406
return new_node
14051407

1406-
######## SDK
1407-
1408-
14091408

14101409

14111410
@pytest.fixture(params=range(100))

plenum/test/helper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -874,15 +874,15 @@ def sdk_signed_random_requests(looper, sdk_wallet, count):
874874
return sdk_sign_request_objects(looper, sdk_wallet, reqs_obj)
875875

876876

877-
def sdk_send_signed_requests(pool_h, signed_reqs: Sequence):
877+
def sdk_send_signed_requests(looper, pool_h, signed_reqs: Sequence):
878878
return [(json.loads(req),
879-
asyncio.ensure_future(submit_sdk_request(pool_h, req)))
879+
asyncio.ensure_future(submit_sdk_request(pool_h, req), loop=looper.loop))
880880
for req in signed_reqs]
881881

882882

883883
def sdk_send_random_requests(looper, pool_h, sdk_wallet, count: int):
884884
reqs = sdk_signed_random_requests(looper, sdk_wallet, count)
885-
return sdk_send_signed_requests(pool_h, reqs)
885+
return sdk_send_signed_requests(looper, pool_h, reqs)
886886

887887

888888
def sdk_send_random_request(looper, pool_h, sdk_wallet):

plenum/test/pool_transactions/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ def sdk_sign_and_send_prepared_request(looper, sdk_wallet, sdk_pool_handle, stri
841841
signed_reqs = sdk_sign_request_objects(looper, sdk_wallet,
842842
[sdk_json_to_request_object(
843843
json.loads(string_req))])
844-
request_couple = sdk_send_signed_requests(sdk_pool_handle, signed_reqs)[0]
844+
request_couple = sdk_send_signed_requests(looper, sdk_pool_handle, signed_reqs)[0]
845845
return request_couple
846846

847847

plenum/test/signing/test_signing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_request_with_incorrect_multisig_signatures(looper, sdk_pool_handle, sdk
9090

9191
multisig_req = sdk_multisign_request_object(looper, sdk_wallet_client2, json.dumps(req.as_dict))
9292

93-
rep1 = sdk_send_signed_requests(sdk_pool_handle, [multisig_req])
93+
rep1 = sdk_send_signed_requests(looper, sdk_pool_handle, [multisig_req])
9494

9595
invalid_signatures = 'did={}, signature={}'.format(req.identifier, req.signatures[req.identifier])
9696
expected_error_message = 'Reason: client request invalid: {}'.\

0 commit comments

Comments
 (0)