refactor: remove some unused stuffs and unit test

cardano-foundation · May 8, 2024 · cea2a1f · cea2a1f
1 parent a57559d
commit cea2a1f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 43 deletions.
diff --git a/services/docker-compose.yaml b/services/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     container_name: idw-keria
     restart: unless-stopped
     build:
-      context: github:cardano-foundation/signify-ts#c1422b041d2ff53b3d4456a29443722b95f35fb5
+      context: github.com/WebOfTrust/keria#da8e53fe92b9027ec5b547c00d4f54f278fbb1b2
       dockerfile: ./images/keria.dockerfile
     environment:
       - KERI_AGENT_CORS=true

diff --git a/src/core/agent/services/ipexCommunicationService.test.ts b/src/core/agent/services/ipexCommunicationService.test.ts
@@ -1,6 +1,7 @@
 import { EventService } from "./eventService";
 import { IpexCommunicationService } from "./ipexCommunicationService";
 import { CredentialStatus } from "./credentialService.types";
+import { IdentifierStorage } from "../records";
 
 const notificationStorage = jest.mocked({
   open: jest.fn(),
@@ -43,7 +44,7 @@ const credentialStorage = jest.mocked({
 
 let credentialListMock = jest.fn();
 let credentialGetMock = jest.fn();
-let identifierListMock = jest.fn();
+const identifierListMock = jest.fn();
 let getExchangeMock = jest.fn().mockImplementation((id: string) => {
   if (id == "saidForUuid") {
     return {
@@ -329,11 +330,14 @@ describe("Ipex communication service of agent", () => {
     credentialListMock = jest.fn().mockReturnValue([{}]);
     identifierStorage.getIdentifierMetadata = jest
       .fn()
-      .mockRejectedValue(new Error());
-    identifierListMock = jest.fn().mockReturnValue({ aids: [] });
+      .mockRejectedValue(
+        new Error(IdentifierStorage.IDENTIFIER_METADATA_RECORD_MISSING)
+      );
     await expect(
       ipexCommunicationService.offerAcdc(id, "credId")
-    ).rejects.toThrowError(IpexCommunicationService.AID_NOT_FOUND);
+    ).rejects.toThrowError(
+      IdentifierStorage.IDENTIFIER_METADATA_RECORD_MISSING
+    );
   });
 
   test("can grant Keri Acdc when received the ipex agree", async () => {
@@ -408,11 +412,17 @@ describe("Ipex communication service of agent", () => {
       },
     });
     credentialListMock = jest.fn().mockReturnValue({ acdc: {} });
-    identifierStorage.getIdentifierMetadata = jest.fn().mockReturnValue(null);
-    identifierListMock = jest.fn().mockReturnValue({ aids: [] });
+    identifierStorage.getIdentifierMetadata =
+      identifierStorage.getIdentifierMetadata = jest
+        .fn()
+        .mockRejectedValue(
+          new Error(IdentifierStorage.IDENTIFIER_METADATA_RECORD_MISSING)
+        );
     await expect(
       ipexCommunicationService.grantApplyAcdc(id)
-    ).rejects.toThrowError(IpexCommunicationService.AID_NOT_FOUND);
+    ).rejects.toThrowError(
+      IdentifierStorage.IDENTIFIER_METADATA_RECORD_MISSING
+    );
   });
 
   test("can not grant Keri Acdc if acdc is not existed", async () => {

diff --git a/src/core/agent/services/ipexCommunicationService.ts b/src/core/agent/services/ipexCommunicationService.ts
@@ -33,7 +33,6 @@ class IpexCommunicationService extends AgentService {
   static readonly CREDENTIAL_NOT_FOUND_WITH_SCHEMA =
     "Credential not found with this schema";
 
-  static readonly AID_NOT_FOUND = "Aid not found";
   static readonly CREDENTIAL_NOT_FOUND = "Credential not found";
 
   static readonly CREDENTIAL_SERVER =
@@ -114,19 +113,10 @@ class IpexCommunicationService extends AgentService {
     const keriNoti = await this.getNotificationRecordById(notificationId);
     const msgSaid = keriNoti.a.d as string;
     const msg = await this.signifyClient.exchanges().get(msgSaid);
-    let holderSignifyName;
-    try {
-      holderSignifyName = (
-        await this.identifierStorage.getIdentifierMetadata(msg.exn.a.i)
-      ).signifyName;
-    } catch (error) {
-      const identifierHolder = await this.getIdentifierById(msg.exn.a.i);
-      holderSignifyName = identifierHolder?.name;
-    }
 
-    if (!holderSignifyName) {
-      throw new Error(IpexCommunicationService.AID_NOT_FOUND);
-    }
+    const holderSignifyName = (
+      await this.identifierStorage.getIdentifierMetadata(msg.exn.a.i)
+    ).signifyName;
 
     const [offer, sigs, gend] = await this.signifyClient.ipex().offer({
       senderName: holderSignifyName,
@@ -151,18 +141,9 @@ class IpexCommunicationService extends AgentService {
     if (!pickedCred) {
       throw new Error(IpexCommunicationService.CREDENTIAL_NOT_FOUND);
     }
-    let holderSignifyName;
-    try {
-      holderSignifyName = (
-        await this.identifierStorage.getIdentifierMetadata(exnMessage.i)
-      ).signifyName;
-    } catch (error) {
-      const identifierHolder = await this.getIdentifierById(msg.exn.a.i);
-      holderSignifyName = identifierHolder?.name;
-    }
-    if (!holderSignifyName) {
-      throw new Error(IpexCommunicationService.AID_NOT_FOUND);
-    }
+    const holderSignifyName = (
+      await this.identifierStorage.getIdentifierMetadata(exnMessage.i)
+    ).signifyName;
 
     const [offer, sigs, gend] = await this.signifyClient.ipex().grant({
       senderName: holderSignifyName,
@@ -328,16 +309,6 @@ class IpexCommunicationService extends AgentService {
       };
     }
   }
-
-  private async getIdentifierById(
-    id: string
-  ): Promise<IdentifierResult | undefined> {
-    const allIdentifiers = await this.signifyClient.identifiers().list();
-    const identifier = allIdentifiers.aids.find(
-      (identifier: IdentifierResult) => identifier.prefix === id
-    );
-    return identifier;
-  }
 }
 
 export { IpexCommunicationService };