From f78bf9dde169ed4e6ee3ddddd84c18ecd5751216 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 4 Dec 2019 12:19:37 +0100 Subject: [PATCH] Remove `as unknown` (#1636) * Remove some as unknowns * Rename sanitize * Remove file --- .../api-derive/src/democracy/referendumVotesFor.ts | 2 +- packages/api/src/base/Decorate.ts | 12 ++++++------ packages/api/src/promise/Api.spec.ts | 2 +- packages/api/src/submittable/createClass.ts | 2 +- .../src/Decorated/storage/fromMetadata/index.ts | 2 +- .../src/Decorated/storage/fromMetadata/substrate.ts | 2 +- packages/rpc-core/src/index.ts | 2 +- .../rpc-provider/src/coder/decodeResponse.spec.ts | 10 +++++----- packages/rpc-provider/src/mock/index.ts | 2 +- packages/types/src/codec/Enum.ts | 2 +- packages/types/src/codec/Struct.ts | 12 ++++++------ packages/types/src/codec/create/getTypeDef.ts | 2 +- packages/types/src/codec/create/sanitize.ts | 2 +- packages/types/src/primitive/Generic/Call.ts | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/api-derive/src/democracy/referendumVotesFor.ts b/packages/api-derive/src/democracy/referendumVotesFor.ts index 77ac0e4499..05e41b34e0 100644 --- a/packages/api-derive/src/democracy/referendumVotesFor.ts +++ b/packages/api-derive/src/democracy/referendumVotesFor.ts @@ -28,7 +28,7 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu accountId, balance: balances[index].votingBalance || createType(api.registry, 'Balance'), vote: votes[index] || createType(api.registry, 'Vote') - } as unknown as DerivedReferendumVote)) + } as DerivedReferendumVote)) ) )); } diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts index 3cc871818a..5a0c1301f1 100644 --- a/packages/api/src/base/Decorate.ts +++ b/packages/api/src/base/Decorate.ts @@ -199,10 +199,10 @@ export default abstract class Decorate extends Events } return section; - }, {} as unknown as DecoratedRpcSection); + }, {} as DecoratedRpcSection); return out; - }, {} as unknown as DecoratedRpc); + }, {} as DecoratedRpc); } protected decorateMulti (decorateMethod: DecorateMethod): QueryableStorageMulti { @@ -223,10 +223,10 @@ export default abstract class Decorate extends Events out[name] = this.decorateExtrinsicEntry(method, creator); return out; - }, {} as unknown as SubmittableModuleExtrinsics); + }, {} as SubmittableModuleExtrinsics); return out; - }, creator as unknown as SubmittableExtrinsics); + }, creator as SubmittableExtrinsics); } private decorateExtrinsicEntry (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic): SubmittableExtrinsicFunction { @@ -242,10 +242,10 @@ export default abstract class Decorate extends Events out[name] = this.decorateStorageEntry(method, decorateMethod); return out; - }, {} as unknown as QueryableModuleStorage); + }, {} as QueryableModuleStorage); return out; - }, {} as unknown as QueryableStorage); + }, {} as QueryableStorage); } private decorateStorageEntry (creator: StorageEntry, decorateMethod: DecorateMethod): QueryableStorageEntry { diff --git a/packages/api/src/promise/Api.spec.ts b/packages/api/src/promise/Api.spec.ts index 4432c634f4..5d38cc6168 100644 --- a/packages/api/src/promise/Api.spec.ts +++ b/packages/api/src/promise/Api.spec.ts @@ -28,7 +28,7 @@ describe('ApiPromise', (): void => { const metadata: any = {}; const key = `${genesisHash}-${specVersion}`; metadata[key] = rpcData; - const api = await ApiPromise.create({ provider, metadata, registry } as unknown as ApiOptions); + const api = await ApiPromise.create({ provider, metadata, registry } as ApiOptions); expect(api.genesisHash).toBeDefined(); expect(api.runtimeMetadata).toBeDefined(); diff --git a/packages/api/src/submittable/createClass.ts b/packages/api/src/submittable/createClass.ts index b5f5052917..de0504868a 100644 --- a/packages/api/src/submittable/createClass.ts +++ b/packages/api/src/submittable/createClass.ts @@ -174,7 +174,7 @@ export default function createClass ({ api, apiType, genesisHash: this._api.genesisHash, runtimeVersion: this._api.runtimeVersion, version: this._api.extrinsicType - } as unknown as SignatureOptions; + } as SignatureOptions; } private _makeEraOptions (options: Partial, { header, nonce }: { header: Header | null; nonce: Index }): SignatureOptions { diff --git a/packages/metadata/src/Decorated/storage/fromMetadata/index.ts b/packages/metadata/src/Decorated/storage/fromMetadata/index.ts index ff5292a60f..50f23e29ef 100644 --- a/packages/metadata/src/Decorated/storage/fromMetadata/index.ts +++ b/packages/metadata/src/Decorated/storage/fromMetadata/index.ts @@ -39,7 +39,7 @@ export default function fromMetadata (registry: Registry, metadata: Metadata): S }, { metaVersion: metadata.version }); return newModule; - }, {} as unknown as ModuleStorage); + }, {} as ModuleStorage); return result; }, { ...getStorage(registry, metadata.version) }); diff --git a/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts b/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts index cd262c2561..1323ce6b12 100644 --- a/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts +++ b/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts @@ -24,7 +24,7 @@ function createRuntimeFunction (method: string, key: string, { documentation, ty modifier: createType(registry, 'StorageEntryModifierLatest', 1), // required type: createType(registry, 'StorageEntryTypeLatest', type, 0), toJSON: (): any => key - } as unknown as StorageEntryMetadataLatest, + } as StorageEntryMetadataLatest, method, prefix: 'Substrate', section: 'substrate' diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index acc83e85eb..b323fbcb7d 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -171,7 +171,7 @@ export default class Rpc implements RpcInterface { : this.createMethodSend(def); return exposed; - }, {} as unknown as RpcInterface[Section]); + }, {} as RpcInterface[Section]); } private createMethodSend (method: RpcMethod): RpcInterfaceMethod { diff --git a/packages/rpc-provider/src/coder/decodeResponse.spec.ts b/packages/rpc-provider/src/coder/decodeResponse.spec.ts index d4fe1e6fcf..b83686cf7d 100644 --- a/packages/rpc-provider/src/coder/decodeResponse.spec.ts +++ b/packages/rpc-provider/src/coder/decodeResponse.spec.ts @@ -20,31 +20,31 @@ describe('decodeResponse', (): void => { it('expects a valid jsonrpc field', (): void => { expect( - (): any => coder.decodeResponse({} as unknown as JsonRpcResponse) + (): any => coder.decodeResponse({} as JsonRpcResponse) ).toThrow(/Invalid jsonrpc/); }); it('expects a valid id field', (): void => { expect( - (): any => coder.decodeResponse({ jsonrpc: '2.0' } as unknown as JsonRpcResponse) + (): any => coder.decodeResponse({ jsonrpc: '2.0' } as JsonRpcResponse) ).toThrow(/Invalid id/); }); it('expects a valid result field', (): void => { expect( - (): any => coder.decodeResponse({ id: 1, jsonrpc: '2.0' } as unknown as JsonRpcResponse) + (): any => coder.decodeResponse({ id: 1, jsonrpc: '2.0' } as JsonRpcResponse) ).toThrow(/No result/); }); it('throws any error found', (): void => { expect( - (): any => coder.decodeResponse({ id: 1, jsonrpc: '2.0', error: { code: 123, message: 'test error' } } as unknown as JsonRpcResponse) + (): any => coder.decodeResponse({ id: 1, jsonrpc: '2.0', error: { code: 123, message: 'test error' } } as JsonRpcResponse) ).toThrow(/123: test error/); }); it('returns the result', (): void => { expect( - coder.decodeResponse({ id: 1, jsonrpc: '2.0', result: 'some result' } as unknown as JsonRpcResponse) + coder.decodeResponse({ id: 1, jsonrpc: '2.0', result: 'some result' } as JsonRpcResponse) ).toEqual('some result'); }); }); diff --git a/packages/rpc-provider/src/mock/index.ts b/packages/rpc-provider/src/mock/index.ts index 068c065ddd..76dcbf2021 100644 --- a/packages/rpc-provider/src/mock/index.ts +++ b/packages/rpc-provider/src/mock/index.ts @@ -75,7 +75,7 @@ export default class Mock implements ProviderInterface { }; return subs; - }, ({} as unknown as MockStateSubscriptions)); + }, ({} as MockStateSubscriptions)); private subscriptionId = 0; diff --git a/packages/types/src/codec/Enum.ts b/packages/types/src/codec/Enum.ts index 3105e37409..7d1591cb3b 100644 --- a/packages/types/src/codec/Enum.ts +++ b/packages/types/src/codec/Enum.ts @@ -39,7 +39,7 @@ function extractDef (registry: Registry, _def: Record | any[] | string = {} as unknown as V, jsonMap: Map = new Map()) { + constructor (registry: Registry, Types: S, value: V | Map | any[] | string = {} as V, jsonMap: Map = new Map()) { const Clazzes = mapToTypeMap(registry, Types); const decoded: T = Struct.decodeStruct(registry, Clazzes, value, jsonMap); @@ -75,9 +75,9 @@ export default class Struct< (raw as any)[key] = values[index]; return raw; - }, {} as unknown as T); + }, {} as T); } else if (!value) { - return {} as unknown as T; + return {} as T; } // We assume from here that value is a JS object (Array, Map, Object) @@ -114,7 +114,7 @@ export default class Struct< } return raw; - }, {} as unknown as T); + }, {} as T); } public static with (Types: S): Constructor> { @@ -162,7 +162,7 @@ export default class Struct< (result as any)[key] = new Type(this.registry).toRawType(); return result; - }, {} as unknown as E); + }, {} as E); } /** @@ -240,7 +240,7 @@ export default class Struct< result[key] = new Type(registry).toRawType(); return result; - }, {} as unknown as Record); + }, {} as Record); } /** diff --git a/packages/types/src/codec/create/getTypeDef.ts b/packages/types/src/codec/create/getTypeDef.ts index ce96f1c96c..f155deb624 100644 --- a/packages/types/src/codec/create/getTypeDef.ts +++ b/packages/types/src/codec/create/getTypeDef.ts @@ -73,7 +73,7 @@ function _decodeFixedVec (value: TypeDef, type: string, _: string): TypeDef { // as a first round, only u8 via u8aFixed, we can add more support assert(vecLen <= 256, `${type}: Only support for [Type; ], where length <= 256`); - value.ext = { length: vecLen, type: vecType } as unknown as TypeDefExtVecFixed; + value.ext = { length: vecLen, type: vecType } as TypeDefExtVecFixed; return value; } diff --git a/packages/types/src/codec/create/sanitize.ts b/packages/types/src/codec/create/sanitize.ts index 6f6479a08c..b2c5162e8a 100644 --- a/packages/types/src/codec/create/sanitize.ts +++ b/packages/types/src/codec/create/sanitize.ts @@ -201,7 +201,7 @@ function _removeWrap (_check: string): Mapper { }; } -export default function santize (value: string): string { +export default function sanitize (value: string): string { return mappings.reduce((result, fn): string => { return fn(result); }, value).trim(); diff --git a/packages/types/src/primitive/Generic/Call.ts b/packages/types/src/primitive/Generic/Call.ts index f46feac20a..524dc8e051 100644 --- a/packages/types/src/primitive/Generic/Call.ts +++ b/packages/types/src/primitive/Generic/Call.ts @@ -129,7 +129,7 @@ export default class Call extends Struct implements IMethod { result[name.toString()] = Type; return result; - }, {} as unknown as ArgsDef); + }, {} as ArgsDef); } /**