fix: use proper permissions to reschedule

PolymeshAssociation · Aug 2, 2021 · 5cbed7a · 5cbed7a
1 parent d5fe33f
commit 5cbed7a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 117 deletions.
diff --git a/src/api/procedures/__tests__/rescheduleInstruction.ts b/src/api/procedures/__tests__/rescheduleInstruction.ts
@@ -1,19 +1,12 @@
 import { u64 } from '@polkadot/types';
 import BigNumber from 'bignumber.js';
-import { TxTags } from 'polymesh-types/types';
 import sinon from 'sinon';
 
-import {
-  getAuthorization,
-  Params,
-  prepareRescheduleInstruction,
-  prepareStorage,
-  Storage,
-} from '~/api/procedures/rescheduleInstruction';
+import { Params, prepareRescheduleInstruction } from '~/api/procedures/rescheduleInstruction';
 import { Context, Instruction } from '~/internal';
 import { dsMockUtils, entityMockUtils, procedureMockUtils } from '~/testUtils/mocks';
 import { Mocked } from '~/testUtils/types';
-import { InstructionDetails, InstructionStatus, RoleType } from '~/types';
+import { InstructionStatus } from '~/types';
 import * as utilsConversionModule from '~/utils/conversion';
 
 jest.mock(
@@ -59,12 +52,14 @@ describe('rescheduleInstruction procedure', () => {
   });
 
   test('should throw an error if the instruction is not Failed', async () => {
-    const proc = procedureMockUtils.getInstance<Params, Instruction, Storage>(mockContext, {
-      instruction: entityMockUtils.getInstructionInstance(),
-      instructionDetails: {
-        status: InstructionStatus.Pending,
-      } as InstructionDetails,
+    entityMockUtils.configureMocks({
+      instructionOptions: {
+        details: {
+          status: InstructionStatus.Pending,
+        },
+      },
     });
+    const proc = procedureMockUtils.getInstance<Params, Instruction>(mockContext);
 
     return expect(
       prepareRescheduleInstruction.call(proc, {
@@ -74,12 +69,7 @@ describe('rescheduleInstruction procedure', () => {
   });
 
   test('should add a reschedule Instruction transaction to the queue', async () => {
-    const proc = procedureMockUtils.getInstance<Params, Instruction, Storage>(mockContext, {
-      instruction: entityMockUtils.getInstructionInstance(),
-      instructionDetails: {
-        status: InstructionStatus.Failed,
-      } as InstructionDetails,
-    });
+    const proc = procedureMockUtils.getInstance<Params, Instruction>(mockContext);
 
     const transaction = dsMockUtils.createTxStub('settlement', 'rescheduleInstruction');
 
@@ -91,48 +81,4 @@ describe('rescheduleInstruction procedure', () => {
 
     sinon.assert.calledWith(addTransactionStub, transaction, {}, rawId);
   });
-
-  describe('getAuthorization', () => {
-    test('should return the appropriate roles and permissions', () => {
-      const venueId = new BigNumber(2);
-      const proc = procedureMockUtils.getInstance<Params, Instruction, Storage>(mockContext, {
-        instruction: entityMockUtils.getInstructionInstance(),
-        instructionDetails: ({
-          venue: entityMockUtils.getVenueInstance({ id: venueId }),
-        } as unknown) as InstructionDetails,
-      });
-      const boundFunc = getAuthorization.bind(proc);
-
-      expect(boundFunc()).toEqual({
-        roles: [{ type: RoleType.VenueOwner, venueId }],
-        permissions: {
-          transactions: [TxTags.settlement.RescheduleInstruction],
-        },
-      });
-    });
-  });
-
-  describe('prepareStorage', () => {
-    test('should return the instruction and its details', async () => {
-      const proc = procedureMockUtils.getInstance<Params, Instruction, Storage>(mockContext);
-      const boundFunc = prepareStorage.bind(proc);
-      const details = { venue: entityMockUtils.getVenueInstance({ id: new BigNumber(2) }) };
-
-      entityMockUtils.configureMocks({
-        instructionOptions: {
-          id,
-          details,
-        },
-      });
-
-      const result = await boundFunc({
-        id,
-      });
-
-      expect(result).toEqual({
-        instruction: entityMockUtils.getInstructionInstance(),
-        instructionDetails: details,
-      });
-    });
-  });
 });
diff --git a/src/api/procedures/rescheduleInstruction.ts b/src/api/procedures/rescheduleInstruction.ts
@@ -2,8 +2,7 @@ import BigNumber from 'bignumber.js';
 import { TxTags } from 'polymesh-types/types';
 
 import { Instruction, PolymeshError, Procedure } from '~/internal';
-import { ErrorCode, InstructionDetails, InstructionStatus, RoleType } from '~/types';
-import { ProcedureAuthorization } from '~/types/internal';
+import { ErrorCode, InstructionStatus } from '~/types';
 import { numberToU64 } from '~/utils/conversion';
 
 /**
@@ -13,33 +12,24 @@ export interface Params {
   id: BigNumber;
 }
 
-/**
- * @hidden
- */
-export interface Storage {
-  instructionDetails: InstructionDetails;
-  instruction: Instruction;
-}
-
 /**
  * @hidden
  */
 export async function prepareRescheduleInstruction(
-  this: Procedure<Params, Instruction, Storage>,
+  this: Procedure<Params, Instruction>,
   args: Params
 ): Promise<Instruction> {
   const {
     context: {
       polymeshApi: { tx },
     },
     context,
-    storage: {
-      instructionDetails: { status },
-      instruction,
-    },
   } = this;
   const { id } = args;
 
+  const instruction = new Instruction({ id }, context);
+  const { status } = await instruction.details();
+
   if (status !== InstructionStatus.Failed) {
     throw new PolymeshError({
       code: ErrorCode.ValidationError,
@@ -60,44 +50,9 @@ export async function prepareRescheduleInstruction(
 /**
  * @hidden
  */
-export function getAuthorization(
-  this: Procedure<Params, Instruction, Storage>
-): ProcedureAuthorization {
-  const {
-    storage: {
-      instructionDetails: {
-        venue: { id },
-      },
-    },
-  } = this;
-
-  return {
-    roles: [{ type: RoleType.VenueOwner, venueId: id }],
+export const rescheduleInstruction = (): Procedure<Params, Instruction> =>
+  new Procedure(prepareRescheduleInstruction, {
     permissions: {
       transactions: [TxTags.settlement.RescheduleInstruction],
     },
-  };
-}
-
-/**
- * @hidden
- */
-export async function prepareStorage(
-  this: Procedure<Params, Instruction, Storage>,
-  { id }: Params
-): Promise<Storage> {
-  const { context } = this;
-  const instruction = new Instruction({ id }, context);
-  const instructionDetails = await instruction.details();
-
-  return {
-    instruction,
-    instructionDetails,
-  };
-}
-
-/**
- * @hidden
- */
-export const rescheduleInstruction = (): Procedure<Params, Instruction, Storage> =>
-  new Procedure(prepareRescheduleInstruction, getAuthorization);
+  });