🧪 Migrate e2e tests from indy to anoncreds (#1443)

* 🎨 Remove empty dif_presentation_spec from examples

* 🧪 Migrate test from indy to anoncreds

* 🧪 Migrate more tests from indy to anoncreds

* 🎨 Add missing type: anoncreds

Author: ff137

app/tests/e2e/issuer/test_save_exchange_record.py

@@ -17,26 +17,27 @@
 
 @pytest.mark.anyio
 @pytest.mark.parametrize("save_exchange_record", [None, False, True])
-@pytest.mark.xdist_group(name="issuer_test_group_3")
+@pytest.mark.xdist_group(name="issuer_test_group")
 async def test_issue_credential_with_save_exchange_record(
-    faber_indy_client: RichAsyncClient,
-    indy_credential_definition_id: str,
-    faber_indy_and_alice_connection: FaberAliceConnect,
+    faber_anoncreds_client: RichAsyncClient,
+    anoncreds_credential_definition_id: str,
+    faber_anoncreds_and_alice_connection: FaberAliceConnect,
     alice_member_client: RichAsyncClient,
     save_exchange_record: Optional[bool],
 ) -> CredentialExchange:
     credential = {
-        "connection_id": faber_indy_and_alice_connection.faber_connection_id,
-        "indy_credential_detail": {
-            "credential_definition_id": indy_credential_definition_id,
+        "type": "anoncreds",
+        "connection_id": faber_anoncreds_and_alice_connection.faber_connection_id,
+        "anoncreds_credential_detail": {
+            "credential_definition_id": anoncreds_credential_definition_id,
             "attributes": sample_credential_attributes,
         },
         "save_exchange_record": save_exchange_record,
     }
 
     # create and send credential offer- issuer
     faber_send_response = (
-        await faber_indy_client.post(
+        await faber_anoncreds_client.post(
             CREDENTIALS_BASE_PATH,
             json=credential,
         )
@@ -84,7 +85,7 @@ async def test_issue_credential_with_save_exchange_record(
         if save_exchange_record:
             # get exchange records from faber side:
             faber_cred_ex_record = (
-                await faber_indy_client.get(
+                await faber_anoncreds_client.get(
                     f"{CREDENTIALS_BASE_PATH}/{faber_credential_exchange_id}"
                 )
             ).json()
@@ -97,42 +98,43 @@ async def test_issue_credential_with_save_exchange_record(
         else:
             # If save_exchange_record was not set, credential should not exist
             with pytest.raises(HTTPException) as exc:
-                await faber_indy_client.get(
+                await faber_anoncreds_client.get(
                     f"{CREDENTIALS_BASE_PATH}/{faber_credential_exchange_id}"
                 )
             assert exc.value.status_code == 404
 
     finally:
         # Clean up
         if save_exchange_record:
-            await faber_indy_client.delete(
+            await faber_anoncreds_client.delete(
                 f"{CREDENTIALS_BASE_PATH}/{faber_credential_exchange_id}"
             )
 
 
 @pytest.mark.anyio
 @pytest.mark.parametrize("save_exchange_record", [None, False, True])
-@pytest.mark.xdist_group(name="issuer_test_group_4")
+@pytest.mark.xdist_group(name="issuer_test_group")
 async def test_request_credential_with_save_exchange_record(
-    faber_indy_client: RichAsyncClient,
-    indy_credential_definition_id: str,
-    faber_indy_and_alice_connection: FaberAliceConnect,
+    faber_anoncreds_client: RichAsyncClient,
+    anoncreds_credential_definition_id: str,
+    faber_anoncreds_and_alice_connection: FaberAliceConnect,
     alice_member_client: RichAsyncClient,
     save_exchange_record: bool,
 ):
     # This test asserts that the holder can control `save_exchange_records` behaviour
     credential = {
-        "connection_id": faber_indy_and_alice_connection.faber_connection_id,
-        "indy_credential_detail": {
-            "credential_definition_id": indy_credential_definition_id,
+        "type": "anoncreds",
+        "connection_id": faber_anoncreds_and_alice_connection.faber_connection_id,
+        "anoncreds_credential_detail": {
+            "credential_definition_id": anoncreds_credential_definition_id,
             "attributes": {"speed": "20", "name": "Alice", "age": "44"},
         },
         "save_exchange_record": True,  # so we can safely delete faber cred ex record in finally block
     }
 
     # Create and send credential offer - issuer
     faber_send_response = (
-        await faber_indy_client.post(
+        await faber_anoncreds_client.post(
             CREDENTIALS_BASE_PATH,
             json=credential,
         )
@@ -201,17 +203,17 @@ async def test_request_credential_with_save_exchange_record(
             await alice_member_client.delete(
                 f"{CREDENTIALS_BASE_PATH}/{alice_credential_exchange_id}"
             )
-        await faber_indy_client.delete(
+        await faber_anoncreds_client.delete(
             f"{CREDENTIALS_BASE_PATH}/{faber_credential_exchange_id}"
         )
 
 
 @pytest.mark.anyio
-@pytest.mark.xdist_group(name="issuer_test_group_3")
+@pytest.mark.xdist_group(name="issuer_test_group")
 async def test_get_cred_exchange_records(
-    faber_indy_client: RichAsyncClient,
-    indy_credential_definition_id: str,
-    faber_indy_and_alice_connection: FaberAliceConnect,
+    faber_anoncreds_client: RichAsyncClient,
+    anoncreds_credential_definition_id: str,
+    faber_anoncreds_and_alice_connection: FaberAliceConnect,
     alice_member_client: RichAsyncClient,
 ):
     # Fetch existing records so we can filter to exclude them. Necessary to cater for long running / regression tests
@@ -220,18 +222,19 @@ async def test_get_cred_exchange_records(
     ).json()
 
     credential = {
-        "connection_id": faber_indy_and_alice_connection.faber_connection_id,
-        "indy_credential_detail": {
-            "credential_definition_id": indy_credential_definition_id,
+        "type": "anoncreds",
+        "connection_id": faber_anoncreds_and_alice_connection.faber_connection_id,
+        "anoncreds_credential_detail": {
+            "credential_definition_id": anoncreds_credential_definition_id,
             "attributes": {"speed": "20", "name": "Alice", "age": "44"},
         },
         "save_exchange_record": True,
     }
 
-    faber_send_response_1 = await faber_indy_client.post(
+    faber_send_response_1 = await faber_anoncreds_client.post(
         CREDENTIALS_BASE_PATH, json=credential
     )
-    faber_send_response_2 = await faber_indy_client.post(
+    faber_send_response_2 = await faber_anoncreds_client.post(
         CREDENTIALS_BASE_PATH, json=credential
     )
 
@@ -283,10 +286,10 @@ async def test_get_cred_exchange_records(
         )
 
     await asyncio.sleep(1)  # short sleep to allow records to update
-    faber_records = (await faber_indy_client.get(CREDENTIALS_BASE_PATH)).json()
+    faber_records = (await faber_anoncreds_client.get(CREDENTIALS_BASE_PATH)).json()
 
     faber_cred_ex_response = (
-        await faber_indy_client.get(CREDENTIALS_BASE_PATH + "?state=done")
+        await faber_anoncreds_client.get(CREDENTIALS_BASE_PATH + "?state=done")
     ).json()
     filtered_cred_ex_records = [
         record
@@ -296,7 +299,7 @@ async def test_get_cred_exchange_records(
     assert len(filtered_cred_ex_records) == 2
 
     faber_cred_ex_response = (
-        await faber_indy_client.get(CREDENTIALS_BASE_PATH + "?role=issuer")
+        await faber_anoncreds_client.get(CREDENTIALS_BASE_PATH + "?role=issuer")
     ).json()
     filtered_cred_ex_records = [
         record
@@ -306,14 +309,14 @@ async def test_get_cred_exchange_records(
     assert len(filtered_cred_ex_records) == 2
 
     faber_cred_ex_response = (
-        await faber_indy_client.get(
+        await faber_anoncreds_client.get(
             f"{CREDENTIALS_BASE_PATH}?thread_id={faber_records[0]['thread_id']}"
         )
     ).json()
     assert len(faber_cred_ex_response) == 1
 
     with pytest.raises(HTTPException) as exc:
-        await faber_indy_client.get(
+        await faber_anoncreds_client.get(
             f"{CREDENTIALS_BASE_PATH}?connection_id=123&thread_id=123&role=asf&state=asd"
         )
     assert exc.value.status_code == 422

app/tests/e2e/test_did_exchange.py

@@ -31,15 +31,15 @@
 @pytest.mark.xdist_group(name="issuer_test_group")
 async def test_create_did_exchange_request(
     alice_member_client: RichAsyncClient,
-    faber_indy_client: RichAsyncClient,
+    faber_anoncreds_client: RichAsyncClient,
     alice_acapy_client: AcaPyClient,
-    faber_indy_acapy_client: AcaPyClient,
+    faber_anoncreds_acapy_client: AcaPyClient,
     use_did: Optional[str],
     use_did_method: Optional[str],
     use_public_did: bool,
 ):
     faber_public_did = await acapy_wallet.get_public_did(
-        controller=faber_indy_acapy_client
+        controller=faber_anoncreds_acapy_client
     )
 
     request_data = {"their_public_did": qualified_did_sov(faber_public_did.did)}
@@ -96,7 +96,7 @@ async def test_create_did_exchange_request(
             )
             # Faber now has a complete connection too
             assert await check_webhook_state(
-                faber_indy_client,
+                faber_anoncreds_client,
                 topic="connections",
                 state="completed",
                 filter_map={"their_did": alice_did},
@@ -118,20 +118,20 @@ async def test_create_did_exchange_request(
 @pytest.mark.xdist_group(name="issuer_test_group")
 async def test_accept_did_exchange_invitation(
     alice_member_client: RichAsyncClient,
-    faber_indy_client: RichAsyncClient,
+    faber_anoncreds_client: RichAsyncClient,
     tenant_admin_client: RichAsyncClient,
-    faber_indy_acapy_client: AcaPyClient,
+    faber_anoncreds_acapy_client: AcaPyClient,
     use_public_did: bool,
 ):
     # First disable auto-accept invites for Faber
-    faber_wallet_id = get_wallet_id_from_async_client(client=faber_indy_client)
+    faber_wallet_id = get_wallet_id_from_async_client(client=faber_anoncreds_client)
     await tenant_admin_client.put(
         f"{TENANTS_BASE_PATH}/{faber_wallet_id}",
         json={"extra_settings": {"ACAPY_AUTO_ACCEPT_REQUESTS": False}},
     )
 
     faber_public_did = await acapy_wallet.get_public_did(
-        controller=faber_indy_acapy_client
+        controller=faber_anoncreds_acapy_client
     )
 
     request_data = {"their_public_did": qualified_did_sov(faber_public_did.did)}
@@ -146,7 +146,7 @@ async def test_accept_did_exchange_invitation(
 
     try:
         faber_connection_request_received_event = await check_webhook_state(
-            faber_indy_client,
+            faber_anoncreds_client,
             topic="connections",
             state="request-received",
             filter_map={"their_did": alice_did},
@@ -159,7 +159,7 @@ async def test_accept_did_exchange_invitation(
             "use_public_did": use_public_did,
         }
 
-        faber_accept_request_response = await faber_indy_client.post(
+        faber_accept_request_response = await faber_anoncreds_client.post(
             f"{CONNECTIONS_BASE_PATH}/did-exchange/accept-request", params=accept_params
         )
         assert faber_accept_request_response.status_code == 200
@@ -176,7 +176,7 @@ async def test_accept_did_exchange_invitation(
 
         # And Faber's connection is complete
         assert await check_webhook_state(
-            faber_indy_client,
+            faber_anoncreds_client,
             topic="connections",
             state="completed",
             filter_map={"connection_id": faber_connection_id},

app/tests/e2e/test_did_rotate.py

@@ -19,12 +19,12 @@
 async def test_rotate_did(
     alice_member_client: RichAsyncClient,
     alice_acapy_client: AcaPyClient,
-    faber_indy_acapy_client: AcaPyClient,
+    faber_anoncreds_acapy_client: AcaPyClient,
     did_method: str,
 ):
     # First, create did-exchange connections between Alice and Faber:
     faber_public_did = await acapy_wallet.get_public_did(
-        controller=faber_indy_acapy_client
+        controller=faber_anoncreds_acapy_client
     )
 
     request_data = {"their_public_did": qualified_did_sov(faber_public_did.did)}
@@ -60,12 +60,12 @@ async def test_rotate_did(
 @pytest.mark.xdist_group(name="issuer_test_group")
 async def test_hangup_did_rotation(
     alice_member_client: RichAsyncClient,
-    faber_indy_client: RichAsyncClient,
-    faber_indy_acapy_client: AcaPyClient,
+    faber_anoncreds_client: RichAsyncClient,
+    faber_anoncreds_acapy_client: AcaPyClient,
 ):
     # First, create did-exchange connections between Alice and Faber:
     faber_public_did = await acapy_wallet.get_public_did(
-        controller=faber_indy_acapy_client
+        controller=faber_anoncreds_acapy_client
     )
 
     request_data = {"their_public_did": qualified_did_sov(faber_public_did.did)}
@@ -84,7 +84,7 @@ async def test_hangup_did_rotation(
     )
 
     faber_event = await check_webhook_state(
-        faber_indy_client,
+        faber_anoncreds_client,
         topic="connections",
         state="completed",
         filter_map={"their_did": alice_did},
@@ -105,7 +105,7 @@ async def test_hangup_did_rotation(
         filter_map={"connection_id": alice_connection_id},
     )
     assert await check_webhook_state(
-        faber_indy_client,
+        faber_anoncreds_client,
         topic="connections",
         state="deleted",
         filter_map={"connection_id": faber_connection_id},
@@ -117,5 +117,7 @@ async def test_hangup_did_rotation(
     assert exc_info.value.status_code == 404
 
     with pytest.raises(HTTPException) as exc_info:
-        await faber_indy_client.get(f"{CONNECTIONS_BASE_PATH}/{faber_connection_id}")
+        await faber_anoncreds_client.get(
+            f"{CONNECTIONS_BASE_PATH}/{faber_connection_id}"
+        )
     assert exc_info.value.status_code == 404