Further modified the indy_node tests to upgrade to indy_vdr

Signed-off-by: Nicholas Massad <[email protected]>

Author: R3CK0

.devcontainer/Dockerfile

@@ -63,8 +63,11 @@ RUN apt update -y && apt install -y \
     make \
     # Indy Node and Plenum
     # Indy SDK is not used anymore
-    #libindy \
-    libssl3 
+    # libindy \
+    ursa=0.3.2-1 \
+    libssl3 \
+    # Need to move libursa.so to parent dir
+    && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
 
 RUN pip3 install -U \
     # Required by setup.py

acceptance/tests/test_ledger.py

@@ -16,10 +16,10 @@ async def test_send_and_get_nym_positive(writer_role, reader_role):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}')
+    writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}')
+    reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}')
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds NYM writer
     await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role)
@@ -47,9 +47,9 @@ async def test_send_and_get_nym_negative(submitter_seed):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, submitter_seed)
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}')
+    submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, submitter_seed)
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds submitter
     await nym_helper(pool_handle, wallet_handle, trustee_did, submitter_did, submitter_vk)
@@ -74,8 +74,8 @@ async def test_send_and_get_attrib_positive(xhash, raw, enc):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}')
+    submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     await nym_helper(pool_handle, wallet_handle, submitter_did, target_did, target_vk)
     res1 = json.loads(await attrib_helper(pool_handle, wallet_handle, target_did, target_did, xhash, raw, enc))
@@ -100,8 +100,8 @@ async def test_send_and_get_attrib_negative(xhash, raw, enc, error):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    target_did, target_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    submitter_did, submitter_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    target_did, target_vk = await did.create_and_store_did(wallet_handle, '{}')
+    submitter_did, submitter_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     await nym_helper(pool_handle, wallet_handle, submitter_did, target_did, target_vk)
     if error:
@@ -126,9 +126,9 @@ async def test_send_and_get_schema_positive(writer_role, reader_role):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}')
+    reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}')
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds SCHEMA writer
     await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role)
@@ -154,7 +154,7 @@ async def test_send_and_get_schema_negative():
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     res = await get_schema_helper(pool_handle, wallet_handle, trustee_did,
                                   '7kqbG8zcdAMc9Q6SMU4xZy:2:schema1:1.0')
@@ -172,9 +172,9 @@ async def test_send_and_get_cred_def_positive(writer_role, reader_role):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}')
+    reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}')
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds CRED_DEF writer
     await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role)
@@ -202,7 +202,7 @@ async def test_send_and_get_cred_def_negative():
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     res = await get_cred_def_helper(pool_handle, wallet_handle, trustee_did,
                                     'AfdMw5jMX9pcNAuSwppbC7:3:CL:297:cred_def_tag')
@@ -220,9 +220,9 @@ async def test_send_and_get_revoc_reg_def_positive(writer_role, reader_role):
     await pool.set_protocol_version(2)
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}')
+    reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}')
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds REVOC_REG_DEF writer
     await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role)
@@ -259,9 +259,9 @@ async def test_send_and_get_revoc_reg_entry_positive(writer_role, reader_role):
     timestamp0 = int(time.time())
     pool_handle, _ = await pool_helper()
     wallet_handle, _, _ = await wallet_helper()
-    writer_did, writer_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    reader_did, reader_vk = await did.create_and_store_my_did(wallet_handle, '{}')
-    trustee_did, trustee_vk = await did.create_and_store_my_did(wallet_handle, json.dumps(
+    writer_did, writer_vk = await did.create_and_store_did(wallet_handle, '{}')
+    reader_did, reader_vk = await did.create_and_store_did(wallet_handle, '{}')
+    trustee_did, trustee_vk = await did.create_and_store_did(wallet_handle, json.dumps(
         {'seed': '000000000000000000000000Trustee1'}))
     # Trustee adds REVOC_REG_ENTRY writer
     await nym_helper(pool_handle, wallet_handle, trustee_did, writer_did, writer_vk, None, writer_role)

acceptance/tests/utils.py

@@ -80,7 +80,7 @@ async def attrib_helper(pool_handle, wallet_handle, submitter_did, target_did, x
 
 
 async def schema_helper(pool_handle, wallet_handle, submitter_did, schema_name, schema_version, schema_attrs):
-    schema_id, schema_json = await anoncreds.issuer_create_schema(submitter_did, schema_name, schema_version,
+    schema_id, schema_json = await create_schema(submitter_did, schema_name, schema_version,
                                                                   schema_attrs)
     req = await ledger.build_schema_request(submitter_did, schema_json)
     res = await ledger.sign_and_submit_request(pool_handle, wallet_handle, submitter_did, req)

indy_node/test/auth_rule/auth_framework/claim_def.py

@@ -1,7 +1,8 @@
 import json
 
 import pytest
-from indy.ledger import build_get_schema_request, parse_get_schema_response
+from indy_node.test.utils import parse_get_schema_response
+from indy_vdr import ledger
 
 from indy_common.authorize import auth_map
 from indy_common.authorize.auth_actions import ADD_PREFIX, EDIT_PREFIX
@@ -25,7 +26,7 @@ def get_schema_json(looper, sdk_pool_handle, sdk_wallet_trustee):
     schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_trustee)
     schema_id = json.loads(schema_json)['id']
 
-    request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id))
+    request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id))
     reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1]
     _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply)))
     return schema_json

indy_node/test/auth_rule/auth_framework/disable_taa.py

@@ -1,7 +1,7 @@
 import json
 
 import pytest
-from indy.ledger import build_acceptance_mechanisms_request
+from indy_vdr import ledger
 
 from indy_common.authorize.auth_actions import ADD_PREFIX
 from indy_common.authorize.auth_constraints import AuthConstraint, IDENTITY_OWNER
@@ -29,7 +29,7 @@ def prepare(self):
         self.send_taa()
 
     def taa_aml_request(self):
-        return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request(
+        return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request(
             self.trustee_wallet[1],
             json.dumps({
                 'Nice way': 'very good way to accept agreement'}),

indy_node/test/auth_rule/auth_framework/revoc_reg_def.py

@@ -1,7 +1,8 @@
 import json
 
 import pytest
-from indy.ledger import build_get_schema_request, parse_get_schema_response
+from indy_vdr import ledger
+from indy_node.test.utils import parse_get_schema_response
 
 from indy_common.state.domain import make_state_path_for_claim_def
 from plenum.common.types import OPERATION
@@ -32,7 +33,7 @@ def get_schema_json(looper, sdk_pool_handle, sdk_wallet_trustee):
     schema_json, _ = sdk_write_schema(looper, sdk_pool_handle, sdk_wallet_trustee)
     schema_id = json.loads(schema_json)['id']
 
-    request = looper.loop.run_until_complete(build_get_schema_request(identifier, schema_id))
+    request = looper.loop.run_until_complete(ledger.build_get_schema_request(identifier, schema_id))
     reply = sdk_get_reply(looper, sdk_sign_and_submit_req(sdk_pool_handle, sdk_wallet_trustee, request))[1]
     _, schema_json = looper.loop.run_until_complete(parse_get_schema_response(json.dumps(reply)))
     return schema_json

indy_node/test/auth_rule/auth_framework/txn_author_agreement.py

@@ -1,7 +1,7 @@
 import pytest
 import json
 
-from indy.ledger import build_acceptance_mechanisms_request
+from indy_vdr import ledger
 
 from plenum.common.util import randomString
 
@@ -73,7 +73,7 @@ def get_changed_auth_rule(self):
         )
 
     def taa_aml_request(self):
-        return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request(
+        return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request(
             self.trustee_wallet[1],
             json.dumps({
                 'Nice way': 'very good way to accept agreement'}),

indy_node/test/auth_rule/auth_framework/txn_author_agreement_aml.py

@@ -1,7 +1,7 @@
 import json
 
 import pytest
-from indy.ledger import build_acceptance_mechanisms_request
+from indy_vdr import ledger
 
 from plenum.common.util import randomString
 
@@ -70,7 +70,7 @@ def get_changed_auth_rule(self):
         )
 
     def taa_aml_request_module(self, wallet):
-        return self.looper.loop.run_until_complete(build_acceptance_mechanisms_request(
+        return self.looper.loop.run_until_complete(ledger.build_acceptance_mechanisms_request(
             wallet[1],
             json.dumps({
                 'Nice way': 'very good way to accept agreement'}),

indy_node/test/auth_rule/helper.py

@@ -47,7 +47,7 @@ def generate_auth_rule_operation(auth_action=ADD_PREFIX, auth_type=NYM,
 def create_verkey_did(looper, wh):
     seed = randomString(32)
     return looper.loop.run_until_complete(
-        create_and_store_my_did(wh, json.dumps({'seed': seed})))
+        create_and_store_did(wh, json.dumps({'seed': seed})))
 
 
 def sdk_send_and_check_auth_rule_request(

indy_node/test/auth_rule/test_node_txn_demote_by_endorser.py

@@ -18,7 +18,7 @@ def test_node_txn_demote_by_endorser(txnPoolNodeSet,
     validators_before = get_pool_validator_count(txnPoolNodeSet)
 
     new_end_did, new_end_verkey = looper.loop.run_until_complete(
-        did.create_and_store_my_did(sdk_wallet_trustee[0], "{}"))
+        did.create_and_store_did(sdk_wallet_trustee[0], "{}"))
 
     # Step 1. Add new Endorser
     sdk_add_new_nym(looper, sdk_pool_handle,