Browse Source

Types, CLI: Remove obsolete createTypeFromConstructor

Leszek Wiesner 3 years ago
parent
commit
ddc3b90268
2 changed files with 5 additions and 5 deletions
  1. 3 3
      cli/src/base/UploadCommandBase.ts
  2. 2 2
      cli/src/commands/content/deleteChannel.ts

+ 3 - 3
cli/src/base/UploadCommandBase.ts

@@ -26,7 +26,7 @@ import { u8aToHex, formatBalance } from '@polkadot/util'
 import { KeyringPair } from '@polkadot/keyring/types'
 import FormData from 'form-data'
 import BN from 'bn.js'
-import { createTypeFromConstructor } from '@joystream/types'
+import { createType } from '@joystream/types'
 import { StorageAssets } from '@joystream/types/content'
 
 ffmpeg.setFfprobePath(ffprobeInstaller.path)
@@ -187,7 +187,7 @@ export default abstract class UploadCommandBase extends ContentDirectoryCommandB
   }
 
   async generateDataObjectParameters(filePath: string): Promise<DataObjectCreationParameters> {
-    return createTypeFromConstructor(DataObjectCreationParameters, {
+    return createType<DataObjectCreationParameters, 'DataObjectCreationParameters'>('DataObjectCreationParameters', {
       size: this.getFileSize(filePath),
       ipfsContentId: await this.calculateFileHash(filePath),
     })
@@ -359,7 +359,7 @@ export default abstract class UploadCommandBase extends ContentDirectoryCommandB
           )} (recoverable on data object(s) removal)\n` +
           `Are you sure you want to continue?`
       )
-      return createTypeFromConstructor(StorageAssets, {
+      return createType<StorageAssets, 'StorageAssets'>('StorageAssets', {
         expected_data_size_fee: feePerMB,
         object_creation_list: resolvedAssets.map((a) => a.parameters),
       })

+ 2 - 2
cli/src/commands/content/deleteChannel.ts

@@ -1,7 +1,7 @@
 import ContentDirectoryCommandBase from '../../base/ContentDirectoryCommandBase'
 import { flags } from '@oclif/command'
 import chalk from 'chalk'
-import { createTypeFromConstructor } from '@joystream/types'
+import { createType } from '@joystream/types'
 import { BagId } from '@joystream/types/storage'
 import ExitCodes from '../../ExitCodes'
 import { formatBalance } from '@polkadot/util'
@@ -42,7 +42,7 @@ export default class DeleteChannelCommand extends ContentDirectoryCommandBase {
 
   async getDataObjectsInfoFromChain(channelId: number): Promise<[string, BN][]> {
     const dataObjects = await this.getApi().dataObjectsInBag(
-      createTypeFromConstructor(BagId, { Dynamic: { Channel: channelId } })
+      createType<BagId, 'BagId'>('BagId', { Dynamic: { Channel: channelId } })
     )
 
     if (dataObjects.length) {