fix: change Portfolio to DefaultPortfolio

PolymeshAssociation · Oct 20, 2020 · 8d71622 · 8d71622
1 parent c622655
commit 8d71622
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/api/entities/Identity/Portfolios.ts b/src/api/entities/Identity/Portfolios.ts
@@ -1,4 +1,4 @@
-import { Identity, Namespace, NumberedPortfolio, Portfolio } from '~/api/entities';
+import { DefaultPortfolio, Identity, Namespace, NumberedPortfolio } from '~/api/entities';
 import { PortfolioNumber } from '~/polkadot';
 import { stringToIdentityId, u64ToBigNumber } from '~/utils';
 
@@ -9,7 +9,7 @@ export class Portfolios extends Namespace<Identity> {
   /**
    * Retrieve all the portfolios for the current identity
    */
-  public async getPortfolios(): Promise<(Portfolio | NumberedPortfolio)[]> {
+  public async getPortfolios(): Promise<[DefaultPortfolio, ...NumberedPortfolio[]]> {
     const {
       context,
       context: {
@@ -23,7 +23,9 @@ export class Portfolios extends Namespace<Identity> {
     const identityId = stringToIdentityId(did, context);
     const rawPortfolios = await portfolio.portfolios.entries(identityId);
 
-    const numberedPortfolios: (Portfolio | NumberedPortfolio)[] = [new Portfolio({ did }, context)];
+    const numberedPortfolios: [DefaultPortfolio, ...NumberedPortfolio[]] = [
+      new DefaultPortfolio({ did }, context),
+    ];
     rawPortfolios.forEach(([key]) => {
       numberedPortfolios.push(
         new NumberedPortfolio({ id: u64ToBigNumber(key.args[1] as PortfolioNumber), did }, context)

diff --git a/src/api/entities/Identity/__tests__/Portfolios.ts b/src/api/entities/Identity/__tests__/Portfolios.ts
@@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
 import { IdentityId } from 'polymesh-types/types';
 import sinon from 'sinon';
 
-import { Identity, Namespace, NumberedPortfolio, Portfolio } from '~/api/entities';
+import { DefaultPortfolio, Identity, Namespace, NumberedPortfolio } from '~/api/entities';
 import { Context } from '~/base';
 import { dsMockUtils, entityMockUtils } from '~/testUtils/mocks';
 import { Mocked } from '~/testUtils/types';
@@ -66,9 +66,9 @@ describe('Portfolios class', () => {
 
       const result = await portfolios.getPortfolios();
       expect(result).toHaveLength(2);
-      expect(result[0] instanceof Portfolio).toBe(true);
+      expect(result[0] instanceof DefaultPortfolio).toBe(true);
       expect(result[1] instanceof NumberedPortfolio).toBe(true);
-      expect((result[0] as Portfolio).owner.did).toEqual(did);
+      expect((result[0] as DefaultPortfolio).owner.did).toEqual(did);
       expect((result[1] as NumberedPortfolio).id).toEqual(numberedPortfolioId);
     });
   });