refactor: refactor some field name and code

cardano-foundation · May 7, 2024 · 635a05d · 635a05d
1 parent 77fc4fc
commit 635a05d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 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.com/WebOfTrust/keria#f24cf4b01932916cc640ff6f20ffda6f641c1ad2
+      context: github:cardano-foundation/signify-ts#c1422b041d2ff53b3d4456a29443722b95f35fb5
       dockerfile: ./images/keria.dockerfile
     environment:
       - KERI_AGENT_CORS=true

diff --git a/src/core/agent/agent.types.ts b/src/core/agent/agent.types.ts
@@ -112,7 +112,7 @@ interface IdentifierResult {
 }
 
 enum NotificationRoute {
-  Credential = "/exn/ipex/grant",
+  ExnIpexGrant = "/exn/ipex/grant",
   MultiSigIcp = "/multisig/icp",
   MultiSigRot = "/multisig/rot",
   ExnIpexApply = "/exn/ipex/apply",

diff --git a/src/core/agent/services/credentialService.test.ts b/src/core/agent/services/credentialService.test.ts
@@ -405,16 +405,16 @@ describe("Credential service of agent", () => {
     ).rejects.toThrowError(CredentialService.CREDENTIAL_NOT_FOUND);
   });
 
-  test("Should be able to getUnhandledIpexGrantNotifications", async () => {
+  test("Should be able to getExnIpexGrantpexGrantNotifications", async () => {
     const notificationRecord = {
       _tags: {
         isDismiss: true,
-        route: NotificationRoute.Credential,
+        route: NotificationRoute.ExnIpexGrant,
       },
       id: "AIeGgKkS23FDK4mxpfodpbWhTydFz2tdM64DER6EdgG-",
       createdAt: new Date(),
       a: {
-        r: NotificationRoute.Credential,
+        r: NotificationRoute.ExnIpexGrant,
         d: "EF6Nmxz8hs0oVc4loyh2J5Sq9H3Z7apQVqjO6e4chtsp",
       },
     };
@@ -438,7 +438,7 @@ describe("Credential service of agent", () => {
       isDismissed: false,
     });
     expect(notificationStorage.findAllByQuery).toBeCalledWith({
-      route: NotificationRoute.Credential,
+      route: NotificationRoute.ExnIpexGrant,
       isDismissed: false,
     });
   });

diff --git a/src/core/agent/services/credentialService.ts b/src/core/agent/services/credentialService.ts
@@ -159,7 +159,7 @@ class CredentialService extends AgentService {
     } = {}
   ): Promise<KeriaNotification[]> {
     const results = await this.notificationStorage.findAllByQuery({
-      route: NotificationRoute.Credential,
+      route: NotificationRoute.ExnIpexGrant,
       ...filters,
     });
     return results.map((result) => {

diff --git a/src/core/agent/services/ipexCommunicationService.ts b/src/core/agent/services/ipexCommunicationService.ts
@@ -127,11 +127,11 @@ class IpexCommunicationService extends AgentService {
     }
     const pickedCred = creds[0];
     let holderSignifyName;
-    const holder = await this.identifierStorage.getIdentifierMetadata(
-      msg.exn.a.i
-    );
-    if (holder && holder.signifyName) {
-      holderSignifyName = holder.signifyName;
+    const signifyName = (
+      await this.identifierStorage.getIdentifierMetadata(msg.exn.a.i)
+    ).signifyName;
+    if (signifyName) {
+      holderSignifyName = signifyName;
     } else {
       const identifierHolder = await this.getIdentifierById(msg.exn.a.i);
       holderSignifyName = identifierHolder?.name;
@@ -166,11 +166,11 @@ class IpexCommunicationService extends AgentService {
     }
     const pickedCred = creds[0];
     let holderSignifyName;
-    const holder = await this.identifierStorage.getIdentifierMetadata(
-      exnMessage.i
-    );
-    if (holder && holder.signifyName) {
-      holderSignifyName = holder.signifyName;
+    const signifyName = (
+      await this.identifierStorage.getIdentifierMetadata(msg.exn.a.i)
+    ).signifyName;
+    if (signifyName) {
+      holderSignifyName = signifyName;
     } else {
       const identifierHolder = await this.getIdentifierById(msg.exn.a.i);
       holderSignifyName = identifierHolder?.name;

diff --git a/src/ui/components/AppWrapper/AppWrapper.test.tsx b/src/ui/components/AppWrapper/AppWrapper.test.tsx
@@ -205,7 +205,7 @@ describe("AppWrapper handler", () => {
       const keriNoti = {
         id: "id",
         a: {
-          r: NotificationRoute.Credential,
+          r: NotificationRoute.ExnIpexGrant,
         },
         createdAt: new Date(),
       } as KeriaNotification;

diff --git a/src/ui/components/AppWrapper/AppWrapper.tsx b/src/ui/components/AppWrapper/AppWrapper.tsx
@@ -66,7 +66,7 @@ const keriaNotificationsChangeHandler = async (
   event: KeriaNotification,
   dispatch: ReturnType<typeof useAppDispatch>
 ) => {
-  if (event?.a?.r === NotificationRoute.Credential) {
+  if (event?.a?.r === NotificationRoute.ExnIpexGrant) {
     dispatch(
       setQueueIncomingRequest({
         id: event?.id,