fix: manual merge

PolymeshAssociation · Jul 13, 2020 · 949a18b · 949a18b
2 parents 91a1357 + 6a4fcbb
commit 949a18b
Show file tree

Hide file tree

Showing 16 changed files with 345 additions and 215 deletions.
diff --git a/src/Polymesh.ts b/src/Polymesh.ts
@@ -28,6 +28,7 @@ import {
   Ensured,
   ErrorCode,
   IdentityWithClaims,
+  LinkType,
   MiddlewareConfig,
   SubCallback,
   TickerReservationStatus,
@@ -36,14 +37,17 @@ import {
 } from '~/types';
 import { ClaimOperation, SignerType } from '~/types/internal';
 import {
+  booleanToBool,
   createClaim,
+  linkTypeToMeshLinkType,
   signerToSignatory,
   stringToTicker,
   tickerToString,
   valueToDid,
 } from '~/utils';
 
 import { Governance } from './Governance';
+import { Link } from './polkadot/polymesh';
 
 interface ConnectParamsBase {
   nodeUrl: string;
@@ -286,11 +290,7 @@ export class Polymesh {
   }): Promise<TickerReservation[]> {
     const {
       context: {
-        polymeshApi: {
-          query: {
-            identity: { links },
-          },
-        },
+        polymeshApi: { rpc },
       },
       context,
     } = this;
@@ -303,16 +303,17 @@ export class Polymesh {
       identity = context.getCurrentIdentity().did;
     }
 
-    const tickers = await links.entries(
-      signerToSignatory({ type: SignerType.Identity, value: identity }, context)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const tickers: Link[] = await (rpc as any).identity.getFilteredLinks(
+      signerToSignatory({ type: SignerType.Identity, value: identity }, context),
+      booleanToBool(false, context),
+      linkTypeToMeshLinkType(LinkType.TickerOwnership, context)
     );
 
-    const tickerReservations = tickers
-      .filter(([, data]) => data.link_data.isTickerOwned)
-      .map(([, data]) => {
-        const ticker = data.link_data.asTickerOwned;
-        return new TickerReservation({ ticker: tickerToString(ticker) }, context);
-      });
+    const tickerReservations = tickers.map(
+      link =>
+        new TickerReservation({ ticker: tickerToString(link.link_data.asTickerOwned) }, context)
+    );
 
     return tickerReservations;
   }
@@ -426,11 +427,7 @@ export class Polymesh {
   public async getSecurityTokens(args?: { did: string | Identity }): Promise<SecurityToken[]> {
     const {
       context: {
-        polymeshApi: {
-          query: {
-            identity: { links },
-          },
-        },
+        polymeshApi: { rpc },
       },
       context,
     } = this;
@@ -443,16 +440,16 @@ export class Polymesh {
       identity = context.getCurrentIdentity().did;
     }
 
-    const identityLinks = await links.entries(
-      signerToSignatory({ type: SignerType.Identity, value: identity }, context)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const identityLinks: Link[] = await (rpc as any).identity.getFilteredLinks(
+      signerToSignatory({ type: SignerType.Identity, value: identity }, context),
+      booleanToBool(false, context),
+      linkTypeToMeshLinkType(LinkType.AssetOwnership, context)
     );
 
-    const securityTokens = identityLinks
-      .filter(([, data]) => data.link_data.isAssetOwned)
-      .map(([, data]) => {
-        const ticker = data.link_data.asAssetOwned;
-        return new SecurityToken({ ticker: tickerToString(ticker) }, context);
-      });
+    const securityTokens = identityLinks.map(
+      data => new SecurityToken({ ticker: tickerToString(data.link_data.asAssetOwned) }, context)
+    );
 
     return securityTokens;
   }

diff --git a/src/__tests__/Polymesh.ts b/src/__tests__/Polymesh.ts
@@ -380,22 +380,17 @@ describe('Polymesh Class', () => {
 
       dsMockUtils.configureMocks({ contextOptions: { withSeed: true } });
 
-      dsMockUtils.createQueryStub('identity', 'links', {
-        entries: [
-          [
-            ['someKey'],
-            dsMockUtils.createMockLink({
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_data: dsMockUtils.createMockLinkData({
-                TickerOwned: dsMockUtils.createMockTicker(fakeTicker),
-              }),
-              expiry: dsMockUtils.createMockOption(),
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_id: dsMockUtils.createMockU64(),
-            }),
-          ],
-        ],
-      });
+      dsMockUtils.createRpcStub('identity', 'getFilteredLinks').returns([
+        dsMockUtils.createMockLink({
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_data: dsMockUtils.createMockLinkData({
+            TickerOwned: dsMockUtils.createMockTicker(fakeTicker),
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_id: dsMockUtils.createMockU64(),
+        }),
+      ]);
 
       const polymesh = await Polymesh.connect({
         nodeUrl: 'wss://some.url',
@@ -413,22 +408,17 @@ describe('Polymesh Class', () => {
 
       dsMockUtils.configureMocks({ contextOptions: { withSeed: true } });
 
-      dsMockUtils.createQueryStub('identity', 'links', {
-        entries: [
-          [
-            ['someKey'],
-            dsMockUtils.createMockLink({
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_data: dsMockUtils.createMockLinkData({
-                TickerOwned: dsMockUtils.createMockTicker(fakeTicker),
-              }),
-              expiry: dsMockUtils.createMockOption(),
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_id: dsMockUtils.createMockU64(),
-            }),
-          ],
-        ],
-      });
+      dsMockUtils.createRpcStub('identity', 'getFilteredLinks').returns([
+        dsMockUtils.createMockLink({
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_data: dsMockUtils.createMockLinkData({
+            TickerOwned: dsMockUtils.createMockTicker(fakeTicker),
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_id: dsMockUtils.createMockU64(),
+        }),
+      ]);
 
       const polymesh = await Polymesh.connect({
         nodeUrl: 'wss://some.url',
@@ -525,22 +515,17 @@ describe('Polymesh Class', () => {
 
       dsMockUtils.configureMocks({ contextOptions: { withSeed: true } });
 
-      dsMockUtils.createQueryStub('identity', 'links', {
-        entries: [
-          [
-            ['someKey'],
-            dsMockUtils.createMockLink({
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_data: dsMockUtils.createMockLinkData({
-                AssetOwned: dsMockUtils.createMockTicker(fakeTicker),
-              }),
-              expiry: dsMockUtils.createMockOption(),
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_id: dsMockUtils.createMockU64(),
-            }),
-          ],
-        ],
-      });
+      dsMockUtils.createRpcStub('identity', 'getFilteredLinks').returns([
+        dsMockUtils.createMockLink({
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_data: dsMockUtils.createMockLinkData({
+            AssetOwned: dsMockUtils.createMockTicker(fakeTicker),
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_id: dsMockUtils.createMockU64(),
+        }),
+      ]);
 
       const polymesh = await Polymesh.connect({
         nodeUrl: 'wss://some.url',
@@ -558,22 +543,17 @@ describe('Polymesh Class', () => {
 
       dsMockUtils.configureMocks({ contextOptions: { withSeed: true } });
 
-      dsMockUtils.createQueryStub('identity', 'links', {
-        entries: [
-          [
-            ['someKey'],
-            dsMockUtils.createMockLink({
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_data: dsMockUtils.createMockLinkData({
-                AssetOwned: dsMockUtils.createMockTicker(fakeTicker),
-              }),
-              expiry: dsMockUtils.createMockOption(),
-              // eslint-disable-next-line @typescript-eslint/camelcase
-              link_id: dsMockUtils.createMockU64(),
-            }),
-          ],
-        ],
-      });
+      dsMockUtils.createRpcStub('identity', 'getFilteredLinks').returns([
+        dsMockUtils.createMockLink({
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_data: dsMockUtils.createMockLinkData({
+            AssetOwned: dsMockUtils.createMockTicker(fakeTicker),
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          // eslint-disable-next-line @typescript-eslint/camelcase
+          link_id: dsMockUtils.createMockU64(),
+        }),
+      ]);
 
       const polymesh = await Polymesh.connect({
         nodeUrl: 'wss://some.url',

diff --git a/src/api/entities/Identity/index.ts b/src/api/entities/Identity/index.ts
@@ -4,6 +4,7 @@ import { SecurityToken } from '~/api/entities/SecurityToken';
 import { TickerReservation } from '~/api/entities/TickerReservation';
 import { Entity, PolymeshError } from '~/base';
 import { Context } from '~/context';
+import { CddStatus } from '~/polkadot';
 import {
   ErrorCode,
   isCddProviderRole,
@@ -191,7 +192,7 @@ export class Identity extends Entity<UniqueIdentifiers> {
     } = this;
     const identityId = stringToIdentityId(did, context);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const result = await (rpc as any).identity.isIdentityHasValidCdd(identityId);
+    const result: CddStatus = await (rpc as any).identity.isIdentityHasValidCdd(identityId);
     return cddStatusToBoolean(result);
   }
 

diff --git a/src/api/entities/SecurityToken/Documents.ts b/src/api/entities/SecurityToken/Documents.ts
@@ -1,8 +1,15 @@
 import { setTokenDocuments, SetTokenDocumentsParams } from '~/api/procedures';
 import { Namespace, TransactionQueue } from '~/base';
-import { TokenDocument } from '~/types';
+import { Link } from '~/polkadot/polymesh';
+import { LinkType, TokenDocument } from '~/types';
 import { SignerType } from '~/types/internal';
-import { documentToTokenDocument, signerToSignatory, tickerToDid } from '~/utils';
+import {
+  booleanToBool,
+  documentToTokenDocument,
+  linkTypeToMeshLinkType,
+  signerToSignatory,
+  tickerToDid,
+} from '~/utils';
 
 import { SecurityToken } from './';
 
@@ -31,18 +38,21 @@ export class Documents extends Namespace<SecurityToken> {
   public async get(): Promise<TokenDocument[]> {
     const {
       context: {
-        polymeshApi: { query },
+        polymeshApi: { rpc },
       },
       context,
       parent: { ticker },
     } = this;
 
-    const links = await query.identity.links.entries(
-      signerToSignatory({ type: SignerType.Identity, value: tickerToDid(ticker) }, context)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const links: Link[] = await (rpc as any).identity.getFilteredLinks(
+      signerToSignatory({ type: SignerType.Identity, value: tickerToDid(ticker) }, context),
+      booleanToBool(false, context),
+      linkTypeToMeshLinkType(LinkType.DocumentOwnership, context)
     );
 
-    return links
-      .filter(([, { link_data: linkData }]) => linkData.isDocumentOwned)
-      .map(([, { link_data: linkData }]) => documentToTokenDocument(linkData.asDocumentOwned));
+    return links.map(({ link_data: linkData }) =>
+      documentToTokenDocument(linkData.asDocumentOwned)
+    );
   }
 }
diff --git a/src/api/entities/SecurityToken/__tests__/Documents.ts b/src/api/entities/SecurityToken/__tests__/Documents.ts
@@ -4,7 +4,6 @@ import { SecurityToken } from '~/api/entities';
 import { setTokenDocuments } from '~/api/procedures';
 import { Namespace, TransactionQueue } from '~/base';
 import { dsMockUtils, entityMockUtils } from '~/testUtils/mocks';
-import { tuple } from '~/types/utils';
 import * as utilsModule from '~/utils';
 
 import { Documents } from '../Documents';
@@ -89,37 +88,27 @@ describe('Documents class', () => {
         })
       );
 
-      const signatory = dsMockUtils.createMockSignatory({
-        Identity: dsMockUtils.createMockIdentityId('tokenDid'),
-      });
       const ids = [dsMockUtils.createMockU64(1), dsMockUtils.createMockU64(2)];
       /* eslint-disable @typescript-eslint/camelcase */
       const linkEntries = [
-        tuple(
-          [signatory, ids[0]],
-          dsMockUtils.createMockLink({
-            link_data: dsMockUtils.createMockLinkData({
-              DocumentOwned: rawDocuments[0],
-            }),
-            expiry: dsMockUtils.createMockOption(),
-            link_id: ids[0],
-          })
-        ),
-        tuple(
-          [signatory, ids[1]],
-          dsMockUtils.createMockLink({
-            link_data: dsMockUtils.createMockLinkData({
-              DocumentOwned: rawDocuments[1],
-            }),
-            expiry: dsMockUtils.createMockOption(),
-            link_id: ids[1],
-          })
-        ),
+        dsMockUtils.createMockLink({
+          link_data: dsMockUtils.createMockLinkData({
+            DocumentOwned: rawDocuments[0],
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          link_id: ids[0],
+        }),
+        dsMockUtils.createMockLink({
+          link_data: dsMockUtils.createMockLinkData({
+            DocumentOwned: rawDocuments[1],
+          }),
+          expiry: dsMockUtils.createMockOption(),
+          link_id: ids[1],
+        }),
       ];
       /* eslint-enable @typescript-eslint/camelcase */
-      dsMockUtils.createQueryStub('identity', 'links', {
-        entries: linkEntries,
-      });
+
+      dsMockUtils.createRpcStub('identity', 'getFilteredLinks').returns(linkEntries);
 
       const context = dsMockUtils.getContextInstance();
       const token = entityMockUtils.getSecurityTokenInstance();

diff --git a/src/api/procedures/__tests__/modifyClaims.ts b/src/api/procedures/__tests__/modifyClaims.ts
@@ -128,12 +128,12 @@ describe('modifyClaims procedure', () => {
 
     const rawAddClaimItems = [
       {
-        target: rawSomeDid,
+        target: rawOtherDid,
         claim: rawCddClaim,
         expiry: null,
       },
       {
-        target: rawOtherDid,
+        target: rawSomeDid,
         claim: rawCddClaim,
         expiry: null,
       },
@@ -234,12 +234,12 @@ describe('modifyClaims procedure', () => {
 
     const rawRevokeClaimItems = [
       {
-        target: rawSomeDid,
+        target: rawOtherDid,
         claim: rawCddClaim,
         expiry: null,
       },
       {
-        target: rawOtherDid,
+        target: rawSomeDid,
         claim: rawCddClaim,
         expiry: null,
       },