fix: replace asset.fundingRound for securityToken.currentFundingRound

PolymeshAssociation · Mar 20, 2020 · 0a33936 · 0a33936
1 parent 190bfc4
commit 0a33936
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/api/procedures/__tests__/modifyToken.ts b/src/api/procedures/__tests__/modifyToken.ts
@@ -43,9 +43,6 @@ describe('modifyToken procedure', () => {
     addTransactionStub = procedureMockUtils.getAddTransactionStub().returns([procedureResult]);
     mockContext = polkadotMockUtils.getContextInstance();
     stringToTickerStub.withArgs(ticker, mockContext).returns(rawTicker);
-    polkadotMockUtils.createQueryStub('asset', 'fundingRound', {
-      returnValue: polkadotMockUtils.createMockFundingRoundName(fundingRound),
-    });
   });
 
   afterEach(() => {

diff --git a/src/api/procedures/modifyToken.ts b/src/api/procedures/modifyToken.ts
@@ -1,12 +1,7 @@
 import { SecurityToken } from '~/api/entities';
 import { PolymeshError, Procedure } from '~/base';
 import { ErrorCode, Role, RoleType } from '~/types';
-import {
-  fundingRoundNameToString,
-  stringToFundingRoundName,
-  stringToTicker,
-  stringToTokenName,
-} from '~/utils';
+import { stringToFundingRoundName, stringToTicker, stringToTokenName } from '~/utils';
 
 export type ModifyTokenParams =
   | { makeDivisible?: true; name: string; fundingRound?: string }
@@ -24,7 +19,7 @@ export async function prepareModifyToken(
 ): Promise<SecurityToken> {
   const {
     context: {
-      polymeshApi: { query, tx },
+      polymeshApi: { tx },
     },
     context,
   } = this;
@@ -43,7 +38,7 @@ export async function prepareModifyToken(
 
   const [{ isDivisible, name }, fundingRound] = await Promise.all([
     securityToken.details(),
-    query.asset.fundingRound(ticker),
+    securityToken.currentFundingRound(),
   ]);
 
   if (makeDivisible) {
@@ -74,7 +69,7 @@ export async function prepareModifyToken(
   }
 
   if (newFundingRound) {
-    if (newFundingRound === fundingRoundNameToString(fundingRound)) {
+    if (newFundingRound === fundingRound) {
       throw new PolymeshError({
         code: ErrorCode.ValidationError,
         message: 'New funding round name is the same as current funding round',

diff --git a/src/testUtils/mocks/entities.ts b/src/testUtils/mocks/entities.ts
@@ -34,6 +34,7 @@ interface TickerReservationOptions {
 interface SecurityTokenOptions {
   ticker?: string;
   details?: Partial<SecurityTokenDetails>;
+  fundingRound?: string;
 }
 
 let identityConstructorStub: SinonStub;
@@ -45,6 +46,7 @@ let identityGetPolyXBalanceStub: SinonStub;
 let identityHasRolesStub: SinonStub;
 let identityHasRoleStub: SinonStub;
 let tickerReservationDetailsStub: SinonStub;
+let securityTokenCurrentFundingRoundStub: SinonStub;
 
 const MockIdentityClass = class {
   /**
@@ -110,6 +112,7 @@ const defaultSecurityTokenOptions: SecurityTokenOptions = {
     isDivisible: false,
     owner: mockInstanceContainer.identity,
   },
+  fundingRound: 'Series A',
 };
 let securityTokenOptions = defaultSecurityTokenOptions;
 
@@ -120,12 +123,16 @@ let securityTokenOptions = defaultSecurityTokenOptions;
 function initSecurityToken(opts?: SecurityTokenOptions): void {
   securityTokenConstructorStub = sinon.stub();
   securityTokenDetailsStub = sinon.stub();
+  securityTokenCurrentFundingRoundStub = sinon.stub();
 
   securityTokenOptions = merge({}, defaultSecurityTokenOptions, opts);
 
   const securityToken = ({
     ticker: securityTokenOptions.ticker,
     details: securityTokenDetailsStub.resolves(securityTokenOptions.details),
+    currentFundingRound: securityTokenCurrentFundingRoundStub.resolves(
+      securityTokenOptions.fundingRound
+    ),
   } as unknown) as MockSecurityToken;
 
   Object.assign(mockInstanceContainer.securityToken, securityToken);