Merge branch 'main' of https://github.com/hyperledger/aries-cloudagent-python into issue#1791

Author: shaangill025

aries_cloudagent/ledger/indy_vdr.py

@@ -19,8 +19,6 @@
 from ..cache.base import BaseCache
 from ..core.profile import Profile
 from ..indy.issuer import IndyIssuer, IndyIssuerError, DEFAULT_CRED_DEF_TAG
-from ..messaging.credential_definitions.util import CRED_DEF_SENT_RECORD_TYPE
-from ..messaging.schemas.util import SCHEMA_SENT_RECORD_TYPE
 from ..storage.base import BaseStorage, StorageRecord
 from ..utils import sentinel
 from ..utils.env import storage_path
@@ -464,19 +462,6 @@ async def create_and_send_schema(
                 else:
                     raise
 
-            schema_id_parts = schema_id.split(":")
-            schema_tags = {
-                "schema_id": schema_id,
-                "schema_issuer_did": public_info.did,
-                "schema_name": schema_id_parts[-2],
-                "schema_version": schema_id_parts[-1],
-                "epoch": str(int(time())),
-            }
-            record = StorageRecord(SCHEMA_SENT_RECORD_TYPE, schema_id, schema_tags)
-            async with self.profile.session() as session:
-                storage = session.inject(BaseStorage)
-                await storage.add_record(record)
-
         return schema_id, schema_def
 
     async def check_existing_schema(
@@ -715,24 +700,6 @@ async def create_and_send_credential_definition(
             if not write_ledger:
                 return (credential_definition_id, {"signed_txn": resp}, novel)
 
-            # Add non-secrets record
-            schema_id_parts = schema_id.split(":")
-            cred_def_tags = {
-                "schema_id": schema_id,
-                "schema_issuer_did": schema_id_parts[0],
-                "schema_name": schema_id_parts[-2],
-                "schema_version": schema_id_parts[-1],
-                "issuer_did": public_info.did,
-                "cred_def_id": credential_definition_id,
-                "epoch": str(int(time())),
-            }
-            record = StorageRecord(
-                CRED_DEF_SENT_RECORD_TYPE, credential_definition_id, cred_def_tags
-            )
-            async with self.profile.session() as session:
-                storage = session.inject(BaseStorage)
-                await storage.add_record(record)
-
         return (credential_definition_id, json.loads(credential_definition_json), novel)
 
     async def get_credential_definition(self, credential_definition_id: str) -> dict:

aries_cloudagent/storage/tests/test_indy_storage.py

@@ -354,7 +354,7 @@ async def test_storage_del_close(self):
                 while not mock_indy_close_search.await_count and c < 10:
                     await asyncio.sleep(0.1)
                     c += 1
-                mock_indy_close_search.assert_awaited_once_with(1)
+                mock_indy_close_search.assert_awaited_with(1)
 
             with async_mock.patch.object(  # error on close
                 indy.non_secrets, "open_wallet_search", async_mock.CoroutineMock()