Merge pull request #9 from Indicio-tech/fix/did-indy-tests

Fix/did indy tests

Author: cjhowland

indy_common/constants.py

@@ -14,7 +14,7 @@
 
 # NYM
 # TODO: Will be defined in plenum
-DIDDOC_CONTENT = "diddoc_content"
+DIDDOC_CONTENT = "diddocContent"
 
 # SCHEMA
 SCHEMA_NAME = "name"

indy_common/test/types/test_get_nym_schema.py

@@ -8,7 +8,7 @@
     ("type", ConstantField),
     ("dest", IdentifierField),
     ("timestamp", IntegerField),
-    ("seNo", TxnSeqNoField)
+    ("seqNo", TxnSeqNoField)
 ])
 
 

indy_common/test/types/test_nym.py

@@ -0,0 +1,31 @@
+from plenum.common.constants import TARGET_NYM, TXN_TYPE
+import pytest
+from indy_common.constants import DIDDOC_CONTENT, NYM
+from indy_common.types import ClientNYMOperation
+
+VALID_TARGET_NYM = 'a' * 43
+
+@pytest.fixture
+def validator():
+    yield ClientNYMOperation()
+
+
+def test_nym(validator):
+    msg = {
+        TXN_TYPE: NYM,
+        TARGET_NYM: VALID_TARGET_NYM,
+        DIDDOC_CONTENT: '{}',
+    }
+    validator.validate(msg)
+
+
+def test_nym_raw_dictionary(validator):
+    msg = {
+        TXN_TYPE: NYM,
+        TARGET_NYM: VALID_TARGET_NYM,
+        DIDDOC_CONTENT: {},
+    }
+    with pytest.raises(TypeError) as ex_info:
+        validator.validate(msg)
+
+    ex_info.match("validation error")

indy_node/server/request_handlers/domain_req_handlers/nym_handler.py

@@ -1,5 +1,6 @@
 from binascii import hexlify
 from hashlib import sha256
+import json
 from typing import Optional
 import base58
 
@@ -8,7 +9,6 @@
 from indy_common.authorize.auth_actions import AuthActionAdd, AuthActionEdit
 from indy_common.authorize.auth_request_validator import WriteRequestValidator
 from indy_common.base_diddoc_template import BaseDIDDoc
-from indy_common.config_util import getConfig
 
 # TODO - Import DIDDOC_CONTENT from plenum?
 from indy_common.constants import NYM, DIDDOC_CONTENT
@@ -31,8 +31,6 @@
 from plenum.server.request_handlers.nym_handler import NymHandler as PNymHandler
 from plenum.server.request_handlers.utils import get_nym_details, nym_to_state_key
 
-config = getConfig()
-NAMESPACE = config.NETWORK_NAME
 # TODO - Clean up
 DID_CONTEXT = "https://www.w3.org/ns/did/v1"
 
@@ -44,6 +42,7 @@ def __init__(self, config, database_manager: DatabaseManager,
                  write_req_validator: WriteRequestValidator):
         super().__init__(config, database_manager)
         self.write_req_validator = write_req_validator
+        self.namespace = config.NETWORK_NAME
 
     def static_validation(self, request: Request):
         self._validate_request_type(request)
@@ -63,6 +62,7 @@ def static_validation(self, request: Request):
 
         diddoc_content = operation.get(DIDDOC_CONTENT, None)
         if diddoc_content:
+            diddoc_content = json.loads(diddoc_content)
             try:
                 self._validate_diddoc_content(diddoc_content)
             except InvalidDIDDocException:
@@ -140,7 +140,7 @@ def _validate_new_nym(self, request, operation):
                     "Non-ledger nym txn must contain verkey for new did",
                 )
 
-        if not self._is_self_certifying(
+        if self.config.ENABLE_DID_INDY and not self._is_self_certifying(
             request.operation.get(TARGET_NYM), request.operation.get(VERKEY)
         ):
             raise InvalidClientRequest(
@@ -197,16 +197,6 @@ def _validate_diddoc_content(self, diddoc):
         if diddoc.get("id", None):
             raise InvalidDIDDocException
 
-        context = diddoc.get("@context", None)
-        if context:
-            # Must be string or array and contain DID_CONTEXT
-            if not isinstance(context, (list, str)):
-                raise InvalidDIDDocException
-            if isinstance(context, str) and not context == DID_CONTEXT:
-                raise InvalidDIDDocException
-            elif isinstance(context, list) and DID_CONTEXT not in context:
-                raise InvalidDIDDocException
-
         # No element in diddoc is allowed to have same id as verkey in base diddoc
         # Alernative would be to merge with base did doc and perform generic did doc validation,
         # e.g. using pyDID
@@ -228,6 +218,6 @@ def _make_base_diddoc(self, request: Request):
         dest = request.operation.get(TARGET_NYM)
         verkey = request.operation.get(VERKEY)
 
-        diddoc = BaseDIDDoc(NAMESPACE, dest, verkey)
+        diddoc = BaseDIDDoc(self.config.NETWORK_NAME, dest, verkey)
 
         return diddoc

indy_node/test/conftest.py

@@ -419,7 +419,8 @@ def fake_node(db_manager, fake_pool_cfg, fake_upgrader, fake_restarter, fake_poo
                          config=FakeSomething(
                              stewardThreshold=20,
                              poolTransactionsFile="//pool_genesis_that_cannot_exist",
-                             domainTransactionsFile="//domain_genesis_that_cannot_exist"
+                             domainTransactionsFile="//domain_genesis_that_cannot_exist",
+                             NETWORK_NAME="sandbox",
                          ),
                          poolCfg=fake_pool_cfg,
                          upgrader=fake_upgrader,

indy_node/test/mock.py

@@ -1,11 +1,17 @@
 import json
 from random import randint
+from typing import Any, Dict, Union
 
 from indy_common.constants import GET_NYM, NYM
 
 
-def build_nym_request(identifier, dest, verkey, diddoc_content, role):
-
+def build_nym_request(
+    identifier: str,
+    dest: str,
+    verkey: str = None,
+    diddoc_content: Union[dict, str] = None,
+    role: str = None
+):
     request = {
         "identifier": identifier,
         "reqId": randint(100, 1000000),
@@ -20,7 +26,11 @@ def build_nym_request(identifier, dest, verkey, diddoc_content, role):
     if verkey:
         operation["verkey"] = verkey
     if diddoc_content:
-        operation["diddoc_content"] = diddoc_content
+        operation["diddocContent"] = (
+            json.dumps(diddoc_content)
+            if isinstance(diddoc_content, dict)
+            else diddoc_content
+        )
     if role:
         operation["role"] = role
 
@@ -29,15 +39,15 @@ def build_nym_request(identifier, dest, verkey, diddoc_content, role):
 
 
 def build_get_nym_request(
-    identifier, dest, timestamp, seq_no
+    identifier: str, dest: str, timestamp: int = None, seq_no: int = None
 ):
     request = {
         "identifier": identifier,
         "reqId": randint(100, 1000000),
         "protocolVersion": 2
     }
 
-    operation = {
+    operation: Dict[str, Any] = {
         "dest": dest,
         "type": GET_NYM
     }

indy_node/test/nym_txn/test_nym_additional.py

@@ -85,7 +85,6 @@ def test_send_same_nyms_only_first_gets_written(looper, sdk_pool_handle, sdk_wal
 
 def get_nym(looper, sdk_pool_handle, sdk_wallet_steward, t_did):
     _, s_did = sdk_wallet_steward
-    print(json.dumps(build_get_nym_request(s_did, t_did)))
     get_nym_req = looper.loop.run_until_complete(build_get_nym_request(s_did, t_did))
     req = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_steward, sdk_pool_handle, get_nym_req

indy_node/test/nym_txn/test_nym_did_indy.py

@@ -27,10 +27,11 @@
         }
     ],
 }
+diddoc_content_json = json.dumps(diddoc_content)
 
 
 # Prepare nym with role endorser and no diddoc content
-@pytest.fixture("module")
+@pytest.fixture(scope="module")
 def prepare_endorser(looper, sdk_pool_handle, sdk_wallet_steward, sdk_wallet_endorser):
     _, did_steward = sdk_wallet_steward
     wh, _ = sdk_wallet_endorser
@@ -46,7 +47,7 @@ def prepare_endorser(looper, sdk_pool_handle, sdk_wallet_steward, sdk_wallet_end
 
 
 # Add diddoc content to nym
-@pytest.fixture("module")
+@pytest.fixture(scope="module")
 def add_diddoc_content(looper, sdk_pool_handle, sdk_wallet_endorser, prepare_endorser):
     _, did = sdk_wallet_endorser
     nym_request = build_nym_request(did, did, None, diddoc_content, None)
@@ -64,27 +65,29 @@ def test_get_nym_data_with_diddoc_content(
     looper, sdk_pool_handle, sdk_wallet_endorser, add_diddoc_content
 ):
     _, did = sdk_wallet_endorser
-    get_nym_request = build_get_nym_request(did, did, None, None)
+    get_nym_request = build_get_nym_request(did, did)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == diddoc_content_json
     )
 
 
 def test_get_previous_nym_data_by_timestamp(
     looper, sdk_pool_handle, sdk_wallet_endorser, add_diddoc_content
 ):
     _, did = sdk_wallet_endorser
+
     # Get current nym data
-    get_nym_request = build_get_nym_request(did, did, None, None)
+    get_nym_request = build_get_nym_request(did, did)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
+
     # Get timestamp from data
     timestamp = replies[0][1]["result"]["txnTime"]
 
@@ -93,61 +96,66 @@ def test_get_previous_nym_data_by_timestamp(
     new_diddoc_content["serviceEndpoint"][0][
         "serviceEndpoint"
     ] = "https://new.example.com"
+    new_diddoc_content = json.dumps(new_diddoc_content)
 
     time.sleep(3)
 
-    nym_request = build_nym_request(did, did, None, new_diddoc_content, None)
+    nym_request = build_nym_request(
+        identifier=did, dest=did, diddoc_content=new_diddoc_content
+    )
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, nym_request
     )
     sdk_get_and_check_replies(looper, [request_couple])
 
-    get_nym_request = build_get_nym_request(did, did, None, None)
+    get_nym_request = build_get_nym_request(did, did)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == new_diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == new_diddoc_content
     )
 
     update_ts = replies[0][1]["result"]["txnTime"]
 
     # Get previous nym data by exact timestamp
-    get_nym_request = build_get_nym_request(did, did, timestamp, None)
+    get_nym_request = build_get_nym_request(did, did, timestamp)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == diddoc_content_json
     )
 
     # Get previous nym data by timestamp but not exact
     ts = randint(timestamp + 1, update_ts - 1)
-    get_nym_request = build_get_nym_request(did, did, ts, None)
+    get_nym_request = build_get_nym_request(did, did, ts)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == diddoc_content_json
     )
 
 
 def test_get_previous_nym_data_by_seq_no(
     looper, sdk_pool_handle, sdk_wallet_endorser, add_diddoc_content
 ):
     _, did = sdk_wallet_endorser
+
     # Get current nym data
-    get_nym_request = build_get_nym_request(did, did, None, None)
+    get_nym_request = build_get_nym_request(did, did)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
+
     # Get seq_no from data
     seq_no = replies[0][1]["result"]["seqNo"]
 
@@ -156,6 +164,7 @@ def test_get_previous_nym_data_by_seq_no(
     new_diddoc_content["serviceEndpoint"][0][
         "serviceEndpoint"
     ] = "https://new.example.com"
+    new_diddoc_content = json.dumps(new_diddoc_content)
 
     time.sleep(3)
 
@@ -165,25 +174,25 @@ def test_get_previous_nym_data_by_seq_no(
     )
     sdk_get_and_check_replies(looper, [request_couple])
 
-    get_nym_request = build_get_nym_request(did, did, None, None)
+    get_nym_request = build_get_nym_request(did, did)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == new_diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == new_diddoc_content
     )
 
     # Get previous nym data by seq_no
-    get_nym_request = build_get_nym_request(did, did, None, seq_no)
+    get_nym_request = build_get_nym_request(did, did, seq_no=seq_no)
     request_couple = sdk_sign_and_send_prepared_request(
         looper, sdk_wallet_endorser, sdk_pool_handle, get_nym_request
     )
     replies = sdk_get_and_check_replies(looper, [request_couple])
 
     assert (
-        json.loads(replies[0][1]["result"]["data"])["diddoc_content"] == diddoc_content
+        json.loads(replies[0][1]["result"]["data"])["diddocContent"] == diddoc_content_json
     )
 
 
@@ -210,26 +219,6 @@ def test_add_arbitrary_property(
     assert replies[0][1]["result"]["txn"]["data"]["someProp"] == "someValue"
 
 
-def test_add_diddoc_content_did_context_missing_fails(
-    looper, sdk_pool_handle, sdk_wallet_endorser, prepare_endorser
-):
-    _, did = sdk_wallet_endorser
-    diddoc_content_without_did_context = copy.deepcopy(diddoc_content)
-    diddoc_content_without_did_context["@context"] = [
-        "https://identity.foundation/didcomm-messaging/service-endpoint/v1"
-    ]
-    nym_request = build_nym_request(
-        did, did, None, diddoc_content_without_did_context, None
-    )
-    request_couple = sdk_sign_and_send_prepared_request(
-        looper, sdk_wallet_endorser, sdk_pool_handle, nym_request
-    )
-    with pytest.raises(RequestNackedException) as e:
-        sdk_get_and_check_replies(looper, [request_couple])
-    e.match("InvalidClientRequest")
-    e.match("Invalid DIDDOC_Content")
-
-
 def test_add_didoc_with_id_fails(
     looper, sdk_pool_handle, sdk_wallet_endorser, prepare_endorser
 ):