feat(identity): move getSecondaryKeys from CurrentIdentity to Identity

PolymeshAssociation · Jun 28, 2021 · 0165d02 · 0165d02
1 parent 1a00869
commit 0165d02
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 67 deletions.
diff --git a/src/api/entities/CurrentIdentity.ts b/src/api/entities/CurrentIdentity.ts
@@ -13,7 +13,7 @@ import {
   toggleFreezeSecondaryKeys,
   Venue,
 } from '~/internal';
-import { ProcedureMethod, SecondaryKey, Signer, SubCallback, UnsubCallback } from '~/types';
+import { ProcedureMethod, Signer } from '~/types';
 import { createProcedureMethod } from '~/utils/internal';
 
 /**
@@ -71,27 +71,6 @@ export class CurrentIdentity extends Identity {
     );
   }
 
-  /**
-   * Get the list of secondary keys related to the Identity
-   *
-   * @note can be subscribed to
-   */
-  public async getSecondaryKeys(): Promise<SecondaryKey[]>;
-  public async getSecondaryKeys(callback: SubCallback<SecondaryKey[]>): Promise<UnsubCallback>;
-
-  // eslint-disable-next-line require-jsdoc
-  public async getSecondaryKeys(
-    callback?: SubCallback<SecondaryKey[]>
-  ): Promise<SecondaryKey[] | UnsubCallback> {
-    const { context } = this;
-
-    if (callback) {
-      return context.getSecondaryKeys(callback);
-    }
-
-    return context.getSecondaryKeys();
-  }
-
   /**
    * Remove a list of secondary keys associated with the Identity
    */

diff --git a/src/api/entities/Identity/__tests__/index.ts b/src/api/entities/Identity/__tests__/index.ts
@@ -15,6 +15,8 @@ import {
   PortfolioCustodianRole,
   Role,
   RoleType,
+  SecondaryKey,
+  SubCallback,
   TickerOwnerRole,
   TokenCaaRole,
   TokenOwnerRole,
@@ -940,4 +942,46 @@ describe('Identity class', () => {
       expect(result).toEqual([expectedDistribution]);
     });
   });
+
+  describe('method: getSecondaryKeys', () => {
+    test('should return a list of Secondaries', async () => {
+      const fakeResult = [
+        {
+          signer: entityMockUtils.getAccountInstance({ address: 'someAddress' }),
+          permissions: {
+            tokens: null,
+            transactions: null,
+            transactionGroups: [],
+            portfolios: null,
+          },
+        },
+      ];
+
+      dsMockUtils.configureMocks({ contextOptions: { secondaryKeys: fakeResult } });
+
+      const did = 'someDid';
+
+      const identity = new Identity({ did }, context);
+
+      const result = await identity.getSecondaryKeys();
+      expect(result).toEqual(fakeResult);
+    });
+
+    test('should allow subscription', async () => {
+      const unsubCallback = 'unsubCallBack';
+
+      const getSecondaryKeysStub = dsMockUtils
+        .getContextInstance()
+        .getSecondaryKeys.resolves(unsubCallback);
+
+      const did = 'someDid';
+
+      const identity = new Identity({ did }, context);
+
+      const callback = (() => [] as unknown) as SubCallback<SecondaryKey[]>;
+      const result = await identity.getSecondaryKeys(callback);
+      expect(result).toEqual(unsubCallback);
+      sinon.assert.calledWithExactly(getSecondaryKeysStub, callback);
+    });
+  });
 });
diff --git a/src/api/entities/Identity/index.ts b/src/api/entities/Identity/index.ts
@@ -30,6 +30,7 @@ import {
   Order,
   ResultSet,
   Role,
+  SecondaryKey,
   SubCallback,
   UnsubCallback,
 } from '~/types';
@@ -562,4 +563,25 @@ export class Identity extends Entity<UniqueIdentifiers> {
       }
     );
   }
+
+  /**
+   * Get the list of secondary keys related to the Identity
+   *
+   * @note can be subscribed to
+   */
+  public async getSecondaryKeys(): Promise<SecondaryKey[]>;
+  public async getSecondaryKeys(callback: SubCallback<SecondaryKey[]>): Promise<UnsubCallback>;
+
+  // eslint-disable-next-line require-jsdoc
+  public async getSecondaryKeys(
+    callback?: SubCallback<SecondaryKey[]>
+  ): Promise<SecondaryKey[] | UnsubCallback> {
+    const { context } = this;
+
+    if (callback) {
+      return context.getSecondaryKeys(callback);
+    }
+
+    return context.getSecondaryKeys();
+  }
 }
diff --git a/src/api/entities/__tests__/CurrentIdentity.ts b/src/api/entities/__tests__/CurrentIdentity.ts
@@ -1,8 +1,6 @@
-import sinon from 'sinon';
-
 import { Context, CurrentIdentity, Identity, TransactionQueue, Venue } from '~/internal';
 import { dsMockUtils, entityMockUtils, procedureMockUtils } from '~/testUtils/mocks';
-import { SecondaryKey, SubCallback, VenueType } from '~/types';
+import { VenueType } from '~/types';
 
 jest.mock(
   '~/base/Procedure',
@@ -38,48 +36,6 @@ describe('CurrentIdentity class', () => {
     expect(CurrentIdentity.prototype instanceof Identity).toBe(true);
   });
 
-  describe('method: getSecondaryKeys', () => {
-    test('should return a list of Secondaries', async () => {
-      const fakeResult = [
-        {
-          signer: entityMockUtils.getAccountInstance({ address: 'someAddress' }),
-          permissions: {
-            tokens: null,
-            transactions: null,
-            transactionGroups: [],
-            portfolios: null,
-          },
-        },
-      ];
-
-      dsMockUtils.configureMocks({ contextOptions: { secondaryKeys: fakeResult } });
-
-      const did = 'someDid';
-
-      const identity = new CurrentIdentity({ did }, context);
-
-      const result = await identity.getSecondaryKeys();
-      expect(result).toEqual(fakeResult);
-    });
-
-    test('should allow subscription', async () => {
-      const unsubCallback = 'unsubCallBack';
-
-      const getSecondaryKeysStub = dsMockUtils
-        .getContextInstance()
-        .getSecondaryKeys.resolves(unsubCallback);
-
-      const did = 'someDid';
-
-      const identity = new CurrentIdentity({ did }, context);
-
-      const callback = (() => [] as unknown) as SubCallback<SecondaryKey[]>;
-      const result = await identity.getSecondaryKeys(callback);
-      expect(result).toEqual(unsubCallback);
-      sinon.assert.calledWithExactly(getSecondaryKeysStub, callback);
-    });
-  });
-
   describe('method: removeSecondaryKeys', () => {
     test('should prepare the procedure with the correct arguments and context, and return the resulting transaction queue', async () => {
       const did = 'someDid';