Просмотр исходного кода

createMock and mockRegistry rename

Leszek Wiesner 4 лет назад
Родитель
Сommit
1d7d84dda4
28 измененных файлов с 284 добавлено и 284 удалено
  1. 13 13
      pioneer/packages/joy-forum/src/Context.tsx
  2. 2 2
      pioneer/packages/joy-forum/src/EditCategory.tsx
  3. 3 3
      pioneer/packages/joy-forum/src/calls.tsx
  4. 2 2
      pioneer/packages/joy-media/src/Upload.tsx
  5. 4 4
      pioneer/packages/joy-media/src/common/TypeHelpers.ts
  6. 2 2
      pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx
  7. 3 3
      pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx
  8. 2 2
      pioneer/packages/joy-media/src/stories/Playback.stories.tsx
  9. 3 3
      pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx
  10. 3 3
      pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx
  11. 4 4
      pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts
  12. 7 7
      pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts
  13. 4 4
      pioneer/packages/joy-media/src/transport.ts
  14. 6 6
      pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts
  15. 6 6
      pioneer/packages/joy-roles/src/balances.spec.ts
  16. 7 7
      pioneer/packages/joy-roles/src/balances.ts
  17. 9 9
      pioneer/packages/joy-roles/src/classifiers.spec.ts
  18. 2 2
      pioneer/packages/joy-roles/src/classifiers.ts
  19. 4 4
      pioneer/packages/joy-roles/src/flows/apply.controller.tsx
  20. 6 6
      pioneer/packages/joy-roles/src/flows/apply.tsx
  21. 4 4
      pioneer/packages/joy-roles/src/mocks.ts
  22. 47 47
      pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx
  23. 19 19
      pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx
  24. 52 52
      pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx
  25. 7 7
      pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx
  26. 16 16
      pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx
  27. 42 42
      pioneer/packages/joy-roles/src/transport.mock.ts
  28. 5 5
      types/src/index.ts

+ 13 - 13
pioneer/packages/joy-forum/src/Context.tsx

@@ -3,7 +3,7 @@
 
 import React, { useReducer, createContext, useContext } from 'react';
 import { Category, Thread, Reply } from '@joystream/types/forum';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 type CategoryId = number;
 type ThreadId = number;
@@ -227,14 +227,14 @@ function reducer (state: ForumState, action: ForumAction): ForumState {
       const { threadById } = state;
 
       const thread = threadById.get(id) as Thread;
-      const moderation = createMock('ModerationAction', {
-        moderated_at: createMock('BlockAndTime', {}),
-        moderator_id: createMock('AccountId', moderator),
-        rationale: createMock('Text', rationale)
+      const moderation = createType('ModerationAction', {
+        moderated_at: createType('BlockAndTime', {}),
+        moderator_id: createType('AccountId', moderator),
+        rationale: createType('Text', rationale)
       });
-      const threadUpd = createMock('Thread', Object.assign(
+      const threadUpd = createType('Thread', Object.assign(
         thread.cloneValues(),
-        { moderation: createMock('Option<ModerationAction>', moderation) }
+        { moderation: createType('Option<ModerationAction>', moderation) }
       ));
 
       threadById.set(id, threadUpd);
@@ -296,14 +296,14 @@ function reducer (state: ForumState, action: ForumAction): ForumState {
       const { replyById } = state;
 
       const reply = replyById.get(id) as Reply;
-      const moderation = createMock('ModerationAction', {
-        moderated_at: createMock('BlockAndTime', {}),
-        moderator_id: createMock('AccountId', moderator),
-        rationale: createMock('Text', rationale)
+      const moderation = createType('ModerationAction', {
+        moderated_at: createType('BlockAndTime', {}),
+        moderator_id: createType('AccountId', moderator),
+        rationale: createType('Text', rationale)
       });
-      const replyUpd = createMock('Reply', Object.assign(
+      const replyUpd = createType('Reply', Object.assign(
         reply.cloneValues(),
-        { moderation: createMock('Option<ModerationAction>', moderation) }
+        { moderation: createType('Option<ModerationAction>', moderation) }
       ));
 
       replyById.set(id, replyUpd);

+ 2 - 2
pioneer/packages/joy-forum/src/EditCategory.tsx

@@ -16,7 +16,7 @@ import { withOnlyForumSudo } from './ForumSudo';
 import { withForumCalls } from './calls';
 import { ValidationProps, withCategoryValidation } from './validation';
 import { TxFailedCallback, TxCallback } from '@polkadot/react-components/Status/types';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 import { useApi } from '@polkadot/react-hooks';
 
 const buildSchema = (props: ValidationProps) => {
@@ -131,7 +131,7 @@ const InnerForm = (props: FormProps) => {
 
     if (isNew) {
       return [
-        createMock('Option<CategoryId>', parentId),
+        createType('Option<CategoryId>', parentId),
         title,
         description
       ];

+ 3 - 3
pioneer/packages/joy-forum/src/calls.tsx

@@ -6,7 +6,7 @@ import { withApi, withCall as withSubstrateCall } from '@polkadot/react-api/hoc'
 import { u64 } from '@polkadot/types';
 import { InterfaceTypes } from '@polkadot/types/types/registry';
 import { useForum, ForumState } from './Context';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 type Call = string | [string, Options];
 
@@ -22,11 +22,11 @@ const getReactValue = (state: ForumState, endpoint: string, paramValue: any) =>
     const id = (paramValue as u64).toNumber();
     const entity = state[mapName].get(id);
 
-    return createMock(type, entity);
+    return createType(type, entity);
   }
 
   switch (endpoint) {
-    case 'forumSudo': return createMock('Option<AccountId>', state.sudo);
+    case 'forumSudo': return createType('Option<AccountId>', state.sudo);
     case 'categoryById': return getEntityById(endpoint, 'Category');
     case 'threadById': return getEntityById(endpoint, 'Thread');
     case 'replyById': return getEntityById(endpoint, 'Reply');

+ 2 - 2
pioneer/packages/joy-media/src/Upload.tsx

@@ -4,7 +4,7 @@ import axios, { CancelTokenSource, AxiosError, AxiosRequestConfig } from 'axios'
 import { History } from 'history';
 import { Progress, Message } from 'semantic-ui-react';
 
-import { mockRegistry } from '@joystream/types';
+import { registry } from '@joystream/types';
 import { InputFileAsync, TxButton, JoyInfo, Loading } from '@polkadot/joy-utils/react/components';
 import { ApiProps } from '@polkadot/react-api/types';
 import { I18nProps } from '@polkadot/react-components/types';
@@ -59,7 +59,7 @@ const defaultState = (): State => ({
   file: undefined,
   computingHash: false,
   ipfs_cid: undefined,
-  newContentId: ContentId.generate(mockRegistry),
+  newContentId: ContentId.generate(registry),
   discovering: false,
   uploading: false,
   sendingTx: false,

+ 4 - 4
pioneer/packages/joy-media/src/common/TypeHelpers.ts

@@ -1,5 +1,5 @@
 import BN from 'bn.js';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { EntityId, ClassId } from '@joystream/types/versioned-store';
 
@@ -17,7 +17,7 @@ export function asChannelId (id: AnyChannelId): ChannelId {
   if (id instanceof ChannelId) {
     return id;
   } else if (canBeId(id)) {
-    return createMock('ChannelId', id);
+    return createType('ChannelId', id);
   } else {
     throw new Error(`Not supported format for Channel id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }
@@ -27,7 +27,7 @@ export function asEntityId (id: AnyEntityId): EntityId {
   if (id instanceof EntityId) {
     return id;
   } else if (canBeId(id)) {
-    return createMock('EntityId', id);
+    return createType('EntityId', id);
   } else {
     throw new Error(`Not supported format for Entity id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }
@@ -37,7 +37,7 @@ export function asClassId (id: AnyClassId): ClassId {
   if (id instanceof ClassId) {
     return id;
   } else if (canBeId(id)) {
-    return createMock('ClassId', id);
+    return createType('ClassId', id);
   } else {
     throw new Error(`Not supported format for Class id: ${typeof id === 'object' ? id.constructor.name : id}`);
   }

+ 2 - 2
pioneer/packages/joy-media/src/stories/MusicAlbumTracks.stories.tsx

@@ -7,7 +7,7 @@ import { MusicAlbumSamples } from './data/MusicAlbumSamples';
 import { albumTracks, AllMusicTrackSamples } from './data/MusicTrackSamples';
 import { withMockTransport } from './withMockTransport';
 import { EditMusicAlbumView } from '../music/EditMusicAlbum.view';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export default {
   title: 'Media | My music tracks',
@@ -19,7 +19,7 @@ export const DefaultState = () =>
 
 export const MockEditAlbumView = () =>
   <EditMusicAlbumView
-    id={createMock('EntityId', 1)}
+    id={createType('EntityId', 1)}
     tracks={albumTracks}
   />;
 

+ 3 - 3
pioneer/packages/joy-media/src/stories/MyChannels.stories.tsx

@@ -7,7 +7,7 @@ import { withMockTransport } from './withMockTransport';
 import EditForm from '../channels/EditChannel';
 import { EditChannelView } from '../channels/EditChannel.view';
 import { AccountIdSamples } from './data/AccountIdSamples';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export default {
   title: 'Media | My channels',
@@ -15,7 +15,7 @@ export default {
 };
 
 // TODO pass to mocked MyMembershipContext provider via Stories decorators:
-const accountId = createMock('AccountId', AccountIdSamples.Alice);
+const accountId = createType('AccountId', AccountIdSamples.Alice);
 
 export const DefaultState = () =>
   <ChannelsByOwner accountId={accountId} />;
@@ -30,4 +30,4 @@ export const DefaultEditForm = () =>
   <EditForm />;
 
 export const MockEditFormView = () =>
-  <EditChannelView id={createMock('ChannelId', 1)} />;
+  <EditChannelView id={createType('ChannelId', 1)} />;

+ 2 - 2
pioneer/packages/joy-media/src/stories/Playback.stories.tsx

@@ -8,7 +8,7 @@ import { Album1TrackSamples } from './data/MusicTrackSamples';
 import { MockMusicChannel, MockVideoChannel } from './data/ChannelSamples';
 import { withMockTransport } from './withMockTransport';
 import { Video } from '../mocks';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export default {
   title: 'Media | Playback',
@@ -17,7 +17,7 @@ export default {
 
 export const PlayVideoStory = () =>
   <PlayVideo
-    id={createMock('EntityId', Video.id)}
+    id={createType('EntityId', Video.id)}
     video={Video}
     channel={MockVideoChannel}
   />;

+ 3 - 3
pioneer/packages/joy-media/src/stories/UploadAudio.stories.tsx

@@ -5,14 +5,14 @@ import '../index.scss';
 import { ContentId } from '@joystream/types/media';
 import { UploadAudioView } from '../upload/UploadAudio.view';
 import { withMockTransport } from './withMockTransport';
-import { mockRegistry, createMock } from '@joystream/types';
+import { registry, createType } from '@joystream/types';
 
 export default {
   title: 'Media | Upload audio',
   decorators: [withMockTransport]
 };
 
-const contentId = ContentId.generate(mockRegistry);
+const contentId = ContentId.generate(registry);
 
 export const DefaultState = () =>
   <EditForm
@@ -22,5 +22,5 @@ export const DefaultState = () =>
 export const MockEditFormView = () =>
   <UploadAudioView
     contentId={contentId}
-    id={createMock('EntityId', 1)}
+    id={createType('EntityId', 1)}
   />;

+ 3 - 3
pioneer/packages/joy-media/src/stories/UploadVideo.stories.tsx

@@ -5,14 +5,14 @@ import '../index.scss';
 import { ContentId } from '@joystream/types/media';
 import { withMockTransport } from './withMockTransport';
 import EditVideoView from '../upload/EditVideo.view';
-import { createMock, mockRegistry } from '@joystream/types';
+import { createType, registry } from '@joystream/types';
 
 export default {
   title: 'Media | Upload video',
   decorators: [withMockTransport]
 };
 
-const contentId = ContentId.generate(mockRegistry);
+const contentId = ContentId.generate(registry);
 
 export const DefaultState = () =>
   <EditForm
@@ -22,5 +22,5 @@ export const DefaultState = () =>
 export const MockEditFormView = () =>
   <EditVideoView
     contentId={contentId}
-    id={createMock('EntityId', 1)}
+    id={createType('EntityId', 1)}
   />;

+ 4 - 4
pioneer/packages/joy-media/src/stories/data/AccountIdSamples.ts

@@ -1,7 +1,7 @@
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export const AccountIdSamples = {
-  Alice: createMock('AccountId', '5GNJqTPyNqANBkUVMN1LPPrxXnFouWXoe2wNSmmEoLctxiZY'),
-  Bob: createMock('AccountId', '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'),
-  Charlie: createMock('AccountId', '5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y')
+  Alice: createType('AccountId', '5GNJqTPyNqANBkUVMN1LPPrxXnFouWXoe2wNSmmEoLctxiZY'),
+  Bob: createType('AccountId', '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'),
+  Charlie: createType('AccountId', '5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y')
 };

+ 7 - 7
pioneer/packages/joy-media/src/stories/data/ChannelSamples.ts

@@ -1,7 +1,7 @@
 import BN from 'bn.js';
 import { ChannelEntity } from '@polkadot/joy-media/entities/ChannelEntity';
 import { AccountIdSamples } from './AccountIdSamples';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 let id = 0;
 const nextId = () => ++id;
@@ -20,10 +20,10 @@ export const MockMusicChannel: ChannelEntity =
 
   publicationStatus: 'Unlisted',
   curationStatus: 'Censored',
-  owner: createMock('MemberId', 1),
+  owner: createType('MemberId', 1),
   roleAccount: AccountIdSamples.Alice,
-  principalId: createMock('PrincipalId', 1),
-  created: createMock('u32', 123456),
+  principalId: createType('PrincipalId', 1),
+  created: createType('u32', 123456),
 
   rewardEarned: new BN('4587'),
   contentItemsCount: 57
@@ -43,10 +43,10 @@ export const MockVideoChannel: ChannelEntity =
 
   publicationStatus: 'Public',
   curationStatus: 'Normal',
-  owner: createMock('MemberId', 1),
+  owner: createType('MemberId', 1),
   roleAccount: AccountIdSamples.Alice,
-  principalId: createMock('PrincipalId', 1),
-  created: createMock('u32', 123456),
+  principalId: createType('PrincipalId', 1),
+  created: createType('u32', 123456),
 
   rewardEarned: new BN('1820021'),
   contentItemsCount: 1529

+ 4 - 4
pioneer/packages/joy-media/src/transport.ts

@@ -18,7 +18,7 @@ import { ChannelEntity } from './entities/ChannelEntity';
 import { ChannelId } from '@joystream/types/content-working-group';
 import { isVideoChannel, isPublicChannel } from './channels/ChannelHelpers';
 import { ValidationConstraint } from '@polkadot/joy-utils/types/ValidationConstraint';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export interface ChannelValidationConstraints {
   handle: ValidationConstraint;
@@ -136,14 +136,14 @@ export abstract class MediaTransport {
     const content = await this.featuredContent();
     const topVideoId = content?.topVideo as unknown as number | undefined;
 
-    return !topVideoId ? undefined : await this.videoById(createMock('EntityId', topVideoId));
+    return !topVideoId ? undefined : await this.videoById(createType('EntityId', topVideoId));
   }
 
   async featuredVideos (): Promise<VideoType[]> {
     const content = await this.featuredContent();
     const videoIds = (content?.featuredVideos || []) as unknown as number[];
     const videos = await Promise.all(videoIds.map((id) =>
-      this.videoById(createMock('EntityId', id))));
+      this.videoById(createType('EntityId', id))));
 
     return videos.filter((x) => x !== undefined) as VideoType[];
   }
@@ -152,7 +152,7 @@ export abstract class MediaTransport {
     const content = await this.featuredContent();
     const albumIds = (content?.featuredAlbums || []) as unknown as EntityId[];
     const albums = await Promise.all(albumIds.map((id) =>
-      this.musicAlbumById(createMock('EntityId', id))));
+      this.musicAlbumById(createType('EntityId', id))));
 
     return albums.filter((x) => x !== undefined) as MusicAlbumType[];
   }

+ 6 - 6
pioneer/packages/joy-proposals/src/stories/data/ProposalDetails.mock.ts

@@ -1,14 +1,14 @@
 import { ParsedProposal } from '@polkadot/joy-utils/types/proposals';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 const mockedProposal: ParsedProposal = {
-  id: createMock('ProposalId', 100),
+  id: createType('ProposalId', 100),
   title: 'Awesome Proposal',
   description: 'Please send me some tokens for coffee',
   createdAtBlock: 36,
   type: 'Text',
-  details: createMock('ProposalDetails', { Text: 'Ciao' }),
-  parameters: createMock('ProposalParameters', {
+  details: createType('ProposalDetails', { Text: 'Ciao' }),
+  parameters: createType('ProposalParameters', {
     approvalQuorumPercentage: 66,
     approvalThresholdPercentage: 80,
     gracePeriod: 0,
@@ -18,7 +18,7 @@ const mockedProposal: ParsedProposal = {
     votingPeriod: 7200
   }),
   proposerId: 303,
-  status: createMock('ProposalStatus', {
+  status: createType('ProposalStatus', {
     Active: {
       stakeId: 0,
       sourceAccountId: '5C4hrfkRjSLwQSFVtCvtbV6wctV1WFnkiexUZWLAh4Bc7jib'
@@ -38,7 +38,7 @@ const mockedProposal: ParsedProposal = {
     subscription: null,
     suspended: false
   },
-  votingResults: createMock('VotingResults', {
+  votingResults: createType('VotingResults', {
     abstensions: 3,
     approvals: 0,
     rejections: 1,

+ 6 - 6
pioneer/packages/joy-roles/src/balances.spec.ts

@@ -1,5 +1,5 @@
 import { Balance } from '@polkadot/types/interfaces';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 import { Avg, AvgDelta, Min, Step, Sum } from './balances';
 
 describe('Balance arithmetic', (): void => {
@@ -7,7 +7,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createMock('u128', i));
+      input.push(createType('u128', i));
     }
 
     expect(Sum(input).toNumber()).toEqual(45);
@@ -17,7 +17,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createMock('u128', i));
+      input.push(createType('u128', i));
     }
 
     expect(Avg(input).toNumber()).toEqual(4);
@@ -27,7 +27,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createMock('u128', i));
+      input.push(createType('u128', i));
     }
 
     expect(AvgDelta(input).toNumber()).toEqual(1);
@@ -37,7 +37,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createMock('u128', i * 10));
+      input.push(createType('u128', i * 10));
     }
 
     expect(Step(input).toNumber()).toEqual(4);
@@ -47,7 +47,7 @@ describe('Balance arithmetic', (): void => {
     const input: Balance[] = [];
 
     for (let i = 0; i < 10; i++) {
-      input.push(createMock('u128', i));
+      input.push(createType('u128', i));
     }
 
     expect(Min(Step(input)).toNumber()).toEqual(1);

+ 7 - 7
pioneer/packages/joy-roles/src/balances.ts

@@ -1,15 +1,15 @@
 import { Balance } from '@polkadot/types/interfaces';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
-export const Zero = createMock('Balance', 0);
-export const One = createMock('Balance', 1);
+export const Zero = createType('Balance', 0);
+export const One = createType('Balance', 1);
 
-export const Add = (x: Balance, y: Balance): Balance => createMock('Balance', x.add(y));
-export const Sub = (x: Balance, y: Balance): Balance => createMock('Balance', x.sub(y));
+export const Add = (x: Balance, y: Balance): Balance => createType('Balance', x.add(y));
+export const Sub = (x: Balance, y: Balance): Balance => createType('Balance', x.sub(y));
 export const Sum = (balances: Balance[]): Balance => balances.reduce(Add, Zero);
 
 export const Avg = (xs: Balance[]): Balance =>
-  xs[0] === undefined ? Zero : createMock('Balance', Sum(xs).divn(xs.length));
+  xs[0] === undefined ? Zero : createType('Balance', Sum(xs).divn(xs.length));
 
 export const AvgDelta = (xs: Balance[]): Balance => {
   if (xs.length < 2) {
@@ -28,7 +28,7 @@ export const AvgDelta = (xs: Balance[]): Balance => {
 };
 
 // An average value to 'step' up balances, like on the nudge controls for a slider
-export const Step = (xs: Balance[], ticks = 10): Balance => createMock('Balance', Avg(xs).divn(ticks));
+export const Step = (xs: Balance[], ticks = 10): Balance => createType('Balance', Avg(xs).divn(ticks));
 export const Min = (x: Balance, min: Balance = One): Balance => x.gte(min) ? x : min;
 
 export const Sort = (xs: Balance[]): Balance[] => {

+ 9 - 9
pioneer/packages/joy-roles/src/classifiers.spec.ts

@@ -3,7 +3,7 @@ import { Opening } from '@joystream/types/hiring';
 import { OpeningState,
   IBlockQueryer,
   classifyOpeningStage, OpeningStageClassification } from './classifiers';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 class MockBlockQueryer {
   hash: string
@@ -48,9 +48,9 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'WaitingToBegin',
       input: {
-        opening: createMock('Opening', {
+        opening: createType('Opening', {
           created: 100,
-          stage: createMock('OpeningStage', {
+          stage: createType('OpeningStage', {
             WaitingToBegin: {
               begins_at_block: 100
             }
@@ -70,11 +70,11 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'Accepting applications',
       input: {
-        opening: createMock('Opening', {
+        opening: createType('Opening', {
           created: 100,
-          stage: createMock('OpeningStage', {
+          stage: createType('OpeningStage', {
             Active: {
-              stage: createMock('ActiveOpeningStage', {
+              stage: createType('ActiveOpeningStage', {
                 acceptingApplications: {
                   started_accepting_applicants_at_block: 100
                 }
@@ -96,11 +96,11 @@ describe('hiring.Opening-> OpeningStageClassification', (): void => {
     {
       description: 'In review period',
       input: {
-        opening: createMock('Opening', {
+        opening: createType('Opening', {
           created: 100,
-          stage: createMock('OpeningStage', {
+          stage: createType('OpeningStage', {
             Active: {
-              stage: createMock('ActiveOpeningStage', {
+              stage: createType('ActiveOpeningStage', {
                 reviewPeriod: {
                   started_accepting_applicants_at_block: 100,
                   started_review_period_at_block: 100

+ 2 - 2
pioneer/packages/joy-roles/src/classifiers.ts

@@ -21,7 +21,7 @@ import { StakeRequirement,
   ApplicationStakeRequirement,
   RoleStakeRequirement,
   StakeType } from './StakeRequirement';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export enum CancelledReason {
   ApplicantCancelled = 0,
@@ -215,7 +215,7 @@ function classifyStakeRequirement<T extends StakeRequirement> (
   option: Option<StakingPolicy>
 ): T {
   if (option.isNone) {
-    return new constructor(createMock('Balance', 0));
+    return new constructor(createType('Balance', 0));
   }
 
   const policy = option.unwrap();

+ 4 - 4
pioneer/packages/joy-roles/src/flows/apply.controller.tsx

@@ -16,7 +16,7 @@ import { keyPairDetails, FlowModal, ProgressSteps } from './apply';
 import { OpeningStakeAndApplicationStatus } from '../tabs/Opportunities';
 import { Min, Step, Sum } from '../balances';
 import { WorkingGroups, AvailableGroups } from '../working_groups';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 import { ApplicationDetailsData } from '@polkadot/joy-utils/types/workingGroups';
 
 type State = {
@@ -48,14 +48,14 @@ type State = {
 
 const newEmptyState = (): State => {
   return {
-    applicationStake: createMock('u128', 0),
-    roleStake: createMock('u128', 0),
+    applicationStake: createType('u128', 0),
+    roleStake: createType('u128', 0),
     appDetails: {},
     hasError: false,
     transactionDetails: new Map<string, string>(),
     roleKeyNameBase: '',
     roleKeyName: '',
-    txKeyAddress: createMock('AccountId', undefined),
+    txKeyAddress: createType('AccountId', undefined),
     activeStep: 0,
     txInProgress: false,
     complete: false

+ 6 - 6
pioneer/packages/joy-roles/src/flows/apply.tsx

@@ -38,7 +38,7 @@ import { IStakeRequirement } from '../StakeRequirement';
 
 import { Loadable } from '@polkadot/joy-utils/react/hocs';
 import { Add } from '../balances';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 import { ApplicationDetailsData, ApplicationQuestionAnswers } from '@polkadot/joy-utils/types/workingGroups';
 
 type accordionProps = {
@@ -110,7 +110,7 @@ export function FundSourceSelector (props: FundSourceSelectorProps & FundSourceC
 
   const onChangeDropdown = (e: any, { value }: any) => {
     if (typeof props.addressCallback !== 'undefined') {
-      props.addressCallback(createMock('AccountId', value));
+      props.addressCallback(createType('AccountId', value));
     }
   };
 
@@ -213,7 +213,7 @@ export function StakeRankSelector (props: StakeRankSelectorProps) {
   props.slots.forEach((slotStake) => props.stake.gt(slotStake.sub(props.otherStake)) && --estimatedSlot);
 
   const changeValue = (e: any, { value }: any) => {
-    const newStake = createMock('Balance', value);
+    const newStake = createType('Balance', value);
 
     props.setStake(newStake);
   };
@@ -626,12 +626,12 @@ type StakeRankMiniSelectorProps = {
 function StakeRankMiniSelector (props: StakeRankMiniSelectorProps) {
   const changeValue = (e: any, { value }: any) => {
     if (value < 0) {
-      props.setValue(createMock('Balance', 0));
+      props.setValue(createType('Balance', 0));
 
       return;
     }
 
-    const newStake = createMock('Balance', value);
+    const newStake = createType('Balance', value);
 
     props.setValue(newStake);
   };
@@ -1061,7 +1061,7 @@ export const FlowModal = Loadable<FlowModalProps>(
 
     useEffect(() => {
       if (txKeyAddress.isEmpty) {
-        setTxKeyAddress(createMock('AccountId', accContext.state.address));
+        setTxKeyAddress(createType('AccountId', accContext.state.address));
       }
     }, [txKeyAddress]);
 

+ 4 - 4
pioneer/packages/joy-roles/src/mocks.ts

@@ -1,9 +1,9 @@
 import { IMembership } from '@joystream/types/members';
 
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export function mockProfile (name: string, avatar_uri = ''): IMembership {
-  return createMock('Membership', {
+  return createType('Membership', {
     handle: name,
     avatar_uri: avatar_uri,
     root_account: '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp',
@@ -11,9 +11,9 @@ export function mockProfile (name: string, avatar_uri = ''): IMembership {
   });
 }
 
-export const mockStage = createMock('OpeningStage', {
+export const mockStage = createType('OpeningStage', {
   Active: {
-    stage: createMock('ActiveOpeningStage', {
+    stage: createType('ActiveOpeningStage', {
       AcceptingApplications: {
         started_accepting_applicants_at_block: 100
       }

+ 47 - 47
pioneer/packages/joy-roles/src/tabs/Admin.controller.tsx

@@ -55,7 +55,7 @@ import { classifyOpeningStage,
 import { openingDescription } from '../openingStateMarkup';
 
 import { Add, Zero } from '../balances';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 type ids = {
   curatorId: number;
@@ -98,7 +98,7 @@ type State = {
 }
 
 function newHRT (title: string): Text {
-  return createMock('Text', JSON.stringify({
+  return createType('Text', JSON.stringify({
     version: 1,
     headline: 'some headline',
     job: {
@@ -143,49 +143,49 @@ function newHRT (title: string): Text {
 }
 
 const createRationingPolicyOpt = (maxApplicants: number) =>
-  createMock('Option<ApplicationRationingPolicy>', {
+  createType('Option<ApplicationRationingPolicy>', {
     max_active_applicants: maxApplicants
   });
 const createStakingPolicyOpt = (amount: number, amount_mode: StakingAmountLimitMode): Option<StakingPolicy> =>
-  createMock('Option<StakingPolicy>', {
+  createType('Option<StakingPolicy>', {
     amount,
     amount_mode
   });
 
-const STAKING_MODE_EXACT = createMock('StakingAmountLimitMode', StakingAmountLimitModeKeys.Exact);
-const STAKING_MODE_AT_LEAST = createMock('StakingAmountLimitMode', StakingAmountLimitModeKeys.AtLeast);
+const STAKING_MODE_EXACT = createType('StakingAmountLimitMode', StakingAmountLimitModeKeys.Exact);
+const STAKING_MODE_AT_LEAST = createType('StakingAmountLimitMode', StakingAmountLimitModeKeys.AtLeast);
 
 const stockOpenings: openingDescriptor[] = [
   {
     title: 'Test config A: no application stake, no role stake, no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999)
+      max_review_period_length: createType('u32', 99999)
     },
     text: newHRT('Test configuration A')
   },
   {
     title: 'Test config B: no application stake, no role stake, 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999)
+      max_review_period_length: createType('u32', 99999)
     },
     text: newHRT('Test configuration B')
   },
   {
     title: 'Test config C: fixed application stake (100), no role stake, no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
     text: newHRT('Test configuration C')
   },
   {
     title: 'Test config D: fixed application stake (100), no role stake, 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
@@ -193,18 +193,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config E: no application stake, fixed role stake (100), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
     text: newHRT('Test configuration E')
   },
   {
     title: 'Test config F: no application stake, fixed role stake (100), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT)
     },
@@ -212,18 +212,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config G: minimum application stake (100), no role stake, no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
     text: newHRT('Test configuration G')
   },
   {
     title: 'Test config H: minimum application stake (100), no role stake, 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
@@ -231,18 +231,18 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config I: no application stake, minimum role stake (100), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
     text: newHRT('Test configuration I')
   },
   {
     title: 'Test config J: no application stake, minimum role stake (100), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       role_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST)
     },
@@ -250,9 +250,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config K: fixed application stake (100), fixed role stake (200), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
     },
@@ -260,9 +260,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config L: fixed application stake (100), fixed role stake (200), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
@@ -271,9 +271,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config M: Minimum application stake (100), minimum role stake (200), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
     },
@@ -281,9 +281,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config N: Minimum application stake (100), minimum role stake (200), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
@@ -292,9 +292,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config O: Fixed application stake (100), minimum role stake (200), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
     },
@@ -302,9 +302,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config P: Fixed application stake (100), minimum role stake (200), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_EXACT),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_AT_LEAST)
@@ -313,9 +313,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config Q: Minimum application stake (100), fixed role stake (200), no applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
     },
@@ -323,9 +323,9 @@ const stockOpenings: openingDescriptor[] = [
   },
   {
     title: 'Test config R: Minimum application stake (100), fixed role stake (200), 10 applicant limit',
-    start: createMock('ActivateOpeningAt', 'CurrentBlock'),
+    start: createType('ActivateOpeningAt', 'CurrentBlock'),
     policy: {
-      max_review_period_length: createMock('u32', 99999),
+      max_review_period_length: createType('u32', 99999),
       application_rationing_policy: createRationingPolicyOpt(10),
       application_staking_policy: createStakingPolicyOpt(100, STAKING_MODE_AT_LEAST),
       role_staking_policy: createStakingPolicyOpt(200, STAKING_MODE_EXACT)
@@ -590,11 +590,11 @@ const NewOpening = (props: NewOpeningProps) => {
     switch (value) {
       case 'CurrentBlock':
         setShowExactBlock(false);
-        setStart(createMock('ActivateOpeningAt', 'CurrentBlock'));
+        setStart(createType('ActivateOpeningAt', 'CurrentBlock'));
         break;
 
       case 'ExactBlock':
-        setStart(createMock('ActivateOpeningAt', { ExactBlock: exactBlock }));
+        setStart(createType('ActivateOpeningAt', { ExactBlock: exactBlock }));
         setShowExactBlock(true);
         break;
     }
@@ -602,7 +602,7 @@ const NewOpening = (props: NewOpeningProps) => {
 
   const onChangeExactBlock = (e: any, { value }: InputOnChangeData) => {
     setExactBlock(typeof value === 'number' ? value : (parseInt(value) || 0));
-    setStart(createMock('ActivateOpeningAt', { ExactBlock: value }));
+    setStart(createType('ActivateOpeningAt', { ExactBlock: value }));
   };
 
   const [policy, setPolicy] = useState(props.desc.policy);
@@ -676,7 +676,7 @@ const NewOpening = (props: NewOpeningProps) => {
     props.fn({
       start: start,
       policy: policy,
-      text: createMock('Text', text),
+      text: createType('Text', text),
       title: ''
     });
   };
@@ -705,7 +705,7 @@ const NewOpening = (props: NewOpeningProps) => {
         <Input
           type='number'
           value={policy.max_review_period_length.toNumber()}
-          onChange={(e: any, { value }: any) => onChangePolicyField('max_review_period_length', createMock('u32', value))}
+          onChange={(e: any, { value }: any) => onChangePolicyField('max_review_period_length', createType('u32', value))}
         />
       </Form.Field>
 

+ 19 - 19
pioneer/packages/joy-roles/src/tabs/MyRoles.elements.stories.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { withKnobs } from '@storybook/addon-knobs';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 import { Container } from 'semantic-ui-react';
 
@@ -34,10 +34,10 @@ export function CurrentRolesFragment () {
   const props: CurrentRolesProps = {
     currentRoles: [
       {
-        workerId: createMock('CuratorId', 1),
+        workerId: createType('CuratorId', 1),
         name: workerRoleNameByGroup[WorkingGroups.StorageProviders],
-        reward: createMock('u128', 321),
-        stake: createMock('u128', 100),
+        reward: createType('u128', 321),
+        stake: createType('u128', 100),
         group: WorkingGroups.StorageProviders,
         CTAs: [
           {
@@ -47,11 +47,11 @@ export function CurrentRolesFragment () {
         ]
       },
       {
-        workerId: createMock('CuratorId', 1),
+        workerId: createType('CuratorId', 1),
         name: 'Some other role',
         url: 'some URL',
-        reward: createMock('u128', 321),
-        stake: createMock('u128', 12343200),
+        reward: createType('u128', 321),
+        stake: createType('u128', 12343200),
         group: WorkingGroups.ContentCurators,
         CTAs: [
           {
@@ -165,8 +165,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -185,8 +185,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -207,8 +207,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 15,
     capacity: 20
@@ -229,8 +229,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       review_end_block: 12345
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -249,8 +249,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20
@@ -269,8 +269,8 @@ const permutations: (ApplicationProps & TestProps)[] = [
       starting_time: yesterday()
     },
     opening: opening,
-    applicationStake: createMock('u128', 5),
-    roleStake: createMock('u128', 15),
+    applicationStake: createType('u128', 5),
+    roleStake: createType('u128', 15),
     cancelCallback: () => { /* do nothing */ },
     rank: 21,
     capacity: 20,

+ 52 - 52
pioneer/packages/joy-roles/src/tabs/Opportunities.elements.stories.tsx

@@ -17,7 +17,7 @@ import { OpeningMetadata } from '../OpeningMetadata';
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 import { WorkingGroups } from '../working_groups';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export default {
   title: 'Roles / Components / Opportunities groups tab / Elements',
@@ -88,81 +88,81 @@ export function OpeningApplicationsStatusByState () {
       _description: 'No limit, no applications, no stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'No limit, some applications, no stake',
       numberOfApplications: 15,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, no applications, no stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, some applications, no stake',
       numberOfApplications: 10,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, full applications, no stake (application impossible)',
       numberOfApplications: 20,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'No limit, no applications, some stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'No limit, some applications, some stake',
       numberOfApplications: 15,
       maxNumberOfApplications: 0,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, no applications, some stake',
       numberOfApplications: 0,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, some applications, some stake',
       numberOfApplications: 10,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     },
     {
       _description: 'Limit, full applications, some stake',
       numberOfApplications: 20,
       maxNumberOfApplications: 20,
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 10)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0)
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 10)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0)
     }
   ];
 
@@ -184,51 +184,51 @@ export function OpeningApplicationsStakeRequirementByStake () {
   const permutations: (StakeRequirementProps & TestProps)[] = [
     {
       _description: 'No stakes required (should be empty)',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required; no role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 500)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required >; no role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 500), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'No app stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 101)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 101)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'No app stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 0), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 102)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 0), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 102)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: '>= App stake required; role stake required',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 101), StakeType.AtLeast),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 102)),
-      defactoMinimumStake: createMock('Balance', 0),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 101), StakeType.AtLeast),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 102)),
+      defactoMinimumStake: createType('Balance', 0),
       maxNumberOfApplications: 0
     },
     {
       _description: 'App stake required; no role stake required; dynamic minimum > 0',
-      requiredApplicationStake: new ApplicationStakeRequirement(createMock('Balance', 500)),
-      requiredRoleStake: new RoleStakeRequirement(createMock('Balance', 0)),
-      defactoMinimumStake: createMock('Balance', 1000),
+      requiredApplicationStake: new ApplicationStakeRequirement(createType('Balance', 500)),
+      requiredRoleStake: new RoleStakeRequirement(createType('Balance', 0)),
+      defactoMinimumStake: createType('Balance', 1000),
       maxNumberOfApplications: 20
     }
   ];

+ 7 - 7
pioneer/packages/joy-roles/src/tabs/Opportunities.stories.tsx

@@ -17,7 +17,7 @@ import { OpeningMetadata } from '../OpeningMetadata';
 import 'semantic-ui-css/semantic.min.css';
 import '@polkadot/joy-roles/index.sass';
 import { WorkingGroups } from '../working_groups';
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 export default {
   title: 'Roles / Components / Opportunities groups tab',
@@ -48,10 +48,10 @@ export function yesterday (): Date {
 }
 
 export function newMockHumanReadableText (obj: any) {
-  return createMock('Text', JSON.stringify(obj));
+  return createType('Text', JSON.stringify(obj));
 }
 
-export const opening = createMock('Opening', {
+export const opening = createType('Opening', {
   created: 100,
   stage: mockStage,
   max_review_period_length: 100,
@@ -131,15 +131,15 @@ export function OpportunitySandbox () {
     numberOfApplications: number('Applications count', 0, applicationSliderOptions, 'Role rationing policy'),
     maxNumberOfApplications: number('Application max', 0, applicationSliderOptions, 'Role rationing policy'),
     requiredApplicationStake: new ApplicationStakeRequirement(
-      createMock('Balance', number('Application stake', 500, moneySliderOptions, 'Role stakes'))
+      createType('Balance', number('Application stake', 500, moneySliderOptions, 'Role stakes'))
     ),
     requiredRoleStake: new RoleStakeRequirement(
-      createMock('Balance', number('Role stake', 0, moneySliderOptions, 'Role stakes'))
+      createType('Balance', number('Role stake', 0, moneySliderOptions, 'Role stakes'))
     ),
-    defactoMinimumStake: createMock('Balance', 0)
+    defactoMinimumStake: createType('Balance', 0)
   };
 
-  const defactoMinimumStake: Balance = createMock('Balance', number('Dynamic min stake', 0, moneySliderOptions, 'Role stakes'));
+  const defactoMinimumStake: Balance = createType('Balance', number('Dynamic min stake', 0, moneySliderOptions, 'Role stakes'));
 
   const meta: OpeningMetadata = {
     id: '1',

+ 16 - 16
pioneer/packages/joy-roles/src/tabs/WorkingGroup.stories.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { boolean, number, text, withKnobs } from '@storybook/addon-knobs';
 
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 import { ContentCurators } from '@polkadot/joy-roles/tabs/WorkingGroup';
 import { GroupMember } from '../elements';
@@ -20,59 +20,59 @@ export default {
 export function ContentCuratorsSection () {
   const members: GroupMember[] = [
     {
-      memberId: createMock('MemberId', 1),
-      roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+      memberId: createType('MemberId', 1),
+      roleAccount: createType('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
       profile: mockProfile(
         text('Handle', 'benholdencrowther', 'Ben'),
         text('Avatar URL', 'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg', 'Ben')
       ),
       title: text('Title', 'Curation lead', 'Ben'),
-      stake: createMock('Balance', number('Stake', 10101, {}, 'Ben')),
+      stake: createType('Balance', number('Stake', 10101, {}, 'Ben')),
       workerId: 1,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: createMock('MemberId', 2),
-      roleAccount: createMock('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
+      memberId: createType('MemberId', 2),
+      roleAccount: createType('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
       profile: mockProfile(text('Handle', 'bwhm0', 'Martin')),
       title: text('Title', 'Content curator', 'Martin'),
-      stake: createMock('Balance', number('Stake', 10101, {}, 'Martin')),
+      stake: createType('Balance', number('Stake', 10101, {}, 'Martin')),
       workerId: 2,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: createMock('MemberId', 3),
-      roleAccount: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+      memberId: createType('MemberId', 3),
+      roleAccount: createType('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
       profile: mockProfile(
         'yourheropaul',
         'https://yhp.io/img/paul.svg'
       ),
       title: text('Title', 'Content curator', 'Paul'),
-      stake: createMock('Balance', number('Stake', 10101, {}, 'Paul')),
+      stake: createType('Balance', number('Stake', 10101, {}, 'Paul')),
       workerId: 3,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: createMock('MemberId', 4),
-      roleAccount: createMock('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
+      memberId: createType('MemberId', 4),
+      roleAccount: createType('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
       profile: mockProfile(
         'alex_joystream',
         'https://avatars2.githubusercontent.com/u/153928?s=200&v=4'
       ),
       title: text('Title', 'Content curator', 'Alex'),
-      stake: createMock('Balance', number('Stake', 10101, {}, 'Alex')),
+      stake: createType('Balance', number('Stake', 10101, {}, 'Alex')),
       workerId: 4,
       group: WorkingGroups.ContentCurators
     },
     {
-      memberId: createMock('MemberId', 5),
-      roleAccount: createMock('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
+      memberId: createType('MemberId', 5),
+      roleAccount: createType('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
       profile: mockProfile(
         'mokhtar',
         'https://avatars2.githubusercontent.com/u/1621012?s=460&v=4'
       ),
       title: text('Title', 'Content curator', 'Mokhtar'),
-      stake: createMock('Balance', number('Stake', 10101, {}, 'Mokhtar')),
+      stake: createType('Balance', number('Stake', 10101, {}, 'Mokhtar')),
       workerId: 5,
       group: WorkingGroups.ContentCurators
     }

+ 42 - 42
pioneer/packages/joy-roles/src/transport.mock.ts

@@ -6,7 +6,7 @@ import MockTransportBase from '@polkadot/joy-utils/transport/mock/base';
 
 import { ITransport } from './transport';
 
-import { createMock } from '@joystream/types';
+import { createType } from '@joystream/types';
 
 import { WorkingGroupMembership, GroupLeadStatus } from './tabs/WorkingGroup';
 import { WorkingGroupOpening } from './tabs/Opportunities';
@@ -35,59 +35,59 @@ export class Transport extends MockTransportBase implements ITransport {
       leadRolesAvailable: false,
       workers: [
         {
-          memberId: createMock('MemberId', 1),
-          roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+          memberId: createType('MemberId', 1),
+          roleAccount: createType('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
           profile: mockProfile(
             'benholdencrowther',
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Content curator',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 1,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: createMock('MemberId', 2),
-          roleAccount: createMock('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
+          memberId: createType('MemberId', 2),
+          roleAccount: createType('AccountId', '5DfJWGbBAH8hLAg8rcRYZW5BEZbE4BJeCQKoxUeqoyewLSew'),
           profile: mockProfile('bwhm0'),
           title: 'Content curator',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 2,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: createMock('MemberId', 3),
-          roleAccount: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+          memberId: createType('MemberId', 3),
+          roleAccount: createType('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
           profile: mockProfile(
             'yourheropaul',
             'https://yhp.io/img/paul.svg'
           ),
           title: 'Content curator',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 3,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: createMock('MemberId', 4),
-          roleAccount: createMock('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
+          memberId: createType('MemberId', 4),
+          roleAccount: createType('AccountId', '5GSMNn8Sy8k64mGUWPDafjMZu9bQNX26GujbBQ1LeJpNbrfg'),
           profile: mockProfile(
             'alex_joystream',
             'https://avatars2.githubusercontent.com/u/153928?s=200&v=4'
           ),
           title: 'Content curator',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 4,
           group: WorkingGroups.ContentCurators
         },
         {
-          memberId: createMock('MemberId', 3),
-          roleAccount: createMock('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
+          memberId: createType('MemberId', 3),
+          roleAccount: createType('AccountId', '5Gn9n7SDJ7VgHqHQWYzkSA4vX6DCmS5TFWdHxikTXp9b4L32'),
           profile: mockProfile(
             'mokhtar',
             'https://avatars2.githubusercontent.com/u/1621012?s=460&v=4'
           ),
           title: 'Content curator',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 5,
           group: WorkingGroups.ContentCurators
         }
@@ -102,14 +102,14 @@ export class Transport extends MockTransportBase implements ITransport {
       leadRolesAvailable: true,
       workers: [
         {
-          memberId: createMock('MemberId', 1),
-          roleAccount: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+          memberId: createType('MemberId', 1),
+          roleAccount: createType('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
           profile: mockProfile(
             'benholdencrowther',
             'https://www.benholdencrowther.com/wp-content/uploads/2019/03/Hanging_Gardens_of_Babylon.jpg'
           ),
           title: 'Storage provider',
-          stake: createMock('u128', 10101),
+          stake: createType('u128', 10101),
           workerId: 1,
           group: WorkingGroups.StorageProviders
         }
@@ -121,7 +121,7 @@ export class Transport extends MockTransportBase implements ITransport {
     return this.simulateApiResponse<Array<WorkingGroupOpening>>(
       [
         {
-          opening: createMock('Opening', {
+          opening: createType('Opening', {
             created: 50000,
             stage: mockStage,
             max_review_period_length: 100,
@@ -178,14 +178,14 @@ export class Transport extends MockTransportBase implements ITransport {
             numberOfApplications: 0,
             maxNumberOfApplications: 0,
             requiredApplicationStake: new ApplicationStakeRequirement(
-              createMock('u128', 500)
+              createType('u128', 500)
             ),
             requiredRoleStake: new RoleStakeRequirement(
-              createMock('u128', 0)
+              createType('u128', 0)
             ),
-            defactoMinimumStake: createMock('u128', 0)
+            defactoMinimumStake: createType('u128', 0)
           },
-          defactoMinimumStake: createMock('u128', 0)
+          defactoMinimumStake: createType('u128', 0)
         }
       ]
     );
@@ -195,7 +195,7 @@ export class Transport extends MockTransportBase implements ITransport {
   async groupOpening (group: WorkingGroups, id: number): Promise<WorkingGroupOpening> {
     return this.simulateApiResponse<WorkingGroupOpening>(
       {
-        opening: createMock('Opening', {
+        opening: createType('Opening', {
           created: 50000,
           stage: mockStage,
           max_review_period_length: 100,
@@ -256,15 +256,15 @@ export class Transport extends MockTransportBase implements ITransport {
           numberOfApplications: 0,
           maxNumberOfApplications: 0,
           requiredApplicationStake: new ApplicationStakeRequirement(
-            createMock('u128', 501),
+            createType('u128', 501),
             StakeType.AtLeast
           ),
           requiredRoleStake: new RoleStakeRequirement(
-            createMock('u128', 502)
+            createType('u128', 502)
           ),
-          defactoMinimumStake: createMock('u128', 0)
+          defactoMinimumStake: createType('u128', 0)
         },
-        defactoMinimumStake: createMock('u128', 0)
+        defactoMinimumStake: createType('u128', 0)
       }
     );
   }
@@ -273,7 +273,7 @@ export class Transport extends MockTransportBase implements ITransport {
     const slots: Balance[] = [];
 
     for (let i = 0; i < 20; i++) {
-      slots.push(createMock('u128', (i * 100) + 10 + i + 1));
+      slots.push(createType('u128', (i * 100) + 10 + i + 1));
     }
 
     return this.simulateApiResponse<Balance[]>(slots);
@@ -297,18 +297,18 @@ export class Transport extends MockTransportBase implements ITransport {
         [
           {
             shortName: 'KP1',
-            accountId: createMock('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
-            balance: createMock('u128', 23342)
+            accountId: createType('AccountId', '5HZ6GtaeyxagLynPryM7ZnmLzoWFePKuDrkb4AT8rT4pU1fp'),
+            balance: createType('u128', 23342)
           },
           {
             shortName: 'KP2',
-            accountId: createMock('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
-            balance: createMock('u128', 993342)
+            accountId: createType('AccountId', '5DQqNWRFPruFs9YKheVMqxUbqoXeMzAWfVfcJgzuia7NA3D3'),
+            balance: createType('u128', 993342)
           },
           {
             shortName: 'KP3',
-            accountId: createMock('AccountId', '5DBaczGTDhcHgwsZzNE5qW15GrQxxdyros4pYkcKrSUovFQ9'),
-            balance: createMock('u128', 242)
+            accountId: createType('AccountId', '5DBaczGTDhcHgwsZzNE5qW15GrQxxdyros4pYkcKrSUovFQ9'),
+            balance: createType('u128', 242)
           }
         ]
       );
@@ -329,7 +329,7 @@ export class Transport extends MockTransportBase implements ITransport {
         starting_block_hash: 'somehash',
         starting_time: yesterday()
       },
-      opening: createMock('Opening', {
+      opening: createType('Opening', {
         created: 50000,
         stage: mockStage,
         max_review_period_length: 100,
@@ -374,8 +374,8 @@ export class Transport extends MockTransportBase implements ITransport {
           }
         })
       }),
-      applicationStake: createMock('u128', 5),
-      roleStake: createMock('u128', 15),
+      applicationStake: createType('u128', 5),
+      roleStake: createType('u128', 15),
       rank: 21,
       capacity: 20
     }];
@@ -385,12 +385,12 @@ export class Transport extends MockTransportBase implements ITransport {
   async myRoles (address: string): Promise<ActiveRole[]> {
     return [
       {
-        workerId: createMock('CuratorId', 1),
+        workerId: createType('CuratorId', 1),
         name: workerRoleNameByGroup[WorkingGroups.ContentCurators],
         group: WorkingGroups.ContentCurators,
         url: 'some URL',
-        reward: createMock('u128', 321),
-        stake: createMock('u128', 12343200)
+        reward: createType('u128', 321),
+        stake: createType('u128', 12343200)
       }
     ];
   }

+ 5 - 5
types/src/index.ts

@@ -16,7 +16,7 @@ import discovery from './discovery'
 import media from './media'
 import proposals from './proposals'
 import { InterfaceTypes } from '@polkadot/types/types/registry'
-import { createType, TypeRegistry } from '@polkadot/types'
+import { TypeRegistry } from '@polkadot/types'
 
 export {
   common,
@@ -62,12 +62,12 @@ export const types: RegistryTypes = {
 }
 
 // Allows creating types without api instance (it's not a recommended way though, so should be used just for mocks)
-export const mockRegistry = new TypeRegistry()
-mockRegistry.register(types)
+export const registry = new TypeRegistry()
+registry.register(types)
 
-export function createMock<TypeName extends keyof InterfaceTypes>(
+export function createType<TypeName extends keyof InterfaceTypes>(
   type: TypeName,
   value: any
 ): InterfaceTypes[TypeName] {
-  return createType(mockRegistry, type, value)
+  return registry.createType(type, value)
 }