From 5ab24390c52cc8cb305cf39d97376130a7b47ff0 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 10 Apr 2020 14:29:58 +0200 Subject: [PATCH] Indicate all protected members and variables (#2154) * Indicate all protected members and variables * Added dropped protected --- packages/api-contract/src/ContractRegistry.ts | 14 +++--- packages/api-contract/src/MetaRegistry.ts | 38 +++++++-------- packages/api-contract/src/base/Blueprint.ts | 2 +- packages/api-contract/src/base/Code.ts | 2 +- packages/api-contract/src/base/Contract.ts | 4 +- packages/api-contract/src/base/util.ts | 4 +- packages/api/src/base/Decorate.ts | 46 +++++++++---------- packages/api/src/base/Init.ts | 20 ++++---- packages/api/src/base/index.ts | 2 +- packages/api/src/promise/Api.spec.ts | 2 +- packages/api/src/promise/Combinator.ts | 12 ++--- packages/api/src/submittable/createClass.ts | 2 +- .../api/src/submittable/createSubmittable.ts | 2 +- packages/types/src/codec/Enum.ts | 4 +- packages/types/src/codec/Result.ts | 2 +- .../src/extrinsic/v2/ExtrinsicSignature.ts | 8 ++-- .../src/extrinsic/v3/ExtrinsicSignature.ts | 6 +-- .../src/extrinsic/v4/ExtrinsicSignature.ts | 8 ++-- 18 files changed, 89 insertions(+), 89 deletions(-) diff --git a/packages/api-contract/src/ContractRegistry.ts b/packages/api-contract/src/ContractRegistry.ts index c4a13439ae..fad7526768 100644 --- a/packages/api-contract/src/ContractRegistry.ts +++ b/packages/api-contract/src/ContractRegistry.ts @@ -61,7 +61,7 @@ export default class ContractRegistry extends MetaRegistry { const unknownKeys = Object.keys(arg).filter((key): boolean => !['name', 'type'].includes(key)); assert(unknownKeys.length === 0, `Unknown keys ${unknownKeys.join(', ')} found in ABI args for ${name}`); - assert(isNumber(arg.name) && isString(this.stringAt(arg.name)), `${name} args should have valid name `); + assert(isNumber(arg.name) && isString(this._stringAt(arg.name)), `${name} args should have valid name `); assert(isNumber(arg.type.ty) && isObject(this.typeDefAt(arg.type.ty)), `${name} args should have valid type`); }); } @@ -85,7 +85,7 @@ export default class ContractRegistry extends MetaRegistry { const { name, return_type: returnType, selector } = message; - assert(isNumber(name) && isString(this.stringAt(name)), `Expected name for ${fnname}`); + assert(isNumber(name) && isString(this._stringAt(name)), `Expected name for ${fnname}`); assert(isNull(returnType) || (isNumber(returnType.ty) && isObject(this.typeDefAt(returnType.ty))), `Expected return_type for ${fnname}`); parseSelector(this.registry, fnname, selector); @@ -100,7 +100,7 @@ export default class ContractRegistry extends MetaRegistry { const { contract: { constructors, messages, name } } = abi; - assert(constructors && messages && isString(this.stringAt(name)), 'ABI should have constructors, messages & name sections'); + assert(constructors && messages && isString(this._stringAt(name)), 'ABI should have constructors, messages & name sections'); this.validateConstructors(abi); this.validateMessages(abi); @@ -151,7 +151,7 @@ export default class ContractRegistry extends MetaRegistry { } public convertArgs (args: ContractABIArgBasePre[]): any[] { - return args.map(({ name, type, ...arg }) => ({ ...arg, name: this.stringAt(name), type: this.convertType(type) })); + return args.map(({ name, type, ...arg }) => ({ ...arg, name: this._stringAt(name), type: this.convertType(type) })); } public convertType ({ display_name: displayNameIndices, ty }: ContractABITypePre): TypeDef { @@ -164,7 +164,7 @@ export default class ContractRegistry extends MetaRegistry { return { constructors: this.convertConstructors(constructors), messages: messages.map((message) => this.convertMessage(message)), - name: this.stringAt(name), + name: this._stringAt(name), ...(events ? { events: events.map((event) => this.convertEvent(event)) } : {}), @@ -184,7 +184,7 @@ export default class ContractRegistry extends MetaRegistry { return { ...message, args: this.convertArgs(args), - name: this.stringAt(name), + name: this._stringAt(name), returnType: returnType ? this.convertType(returnType) : null }; } @@ -211,7 +211,7 @@ export default class ContractRegistry extends MetaRegistry { return { 'struct.fields': structFields.map(({ layout, name }) => ({ layout: this.convertStorageLayout(layout), - name: this.stringAt(name) + name: this._stringAt(name) })), 'struct.type': this.typeDefAt(structType) }; diff --git a/packages/api-contract/src/MetaRegistry.ts b/packages/api-contract/src/MetaRegistry.ts index d6abc0405a..09ed80297a 100644 --- a/packages/api-contract/src/MetaRegistry.ts +++ b/packages/api-contract/src/MetaRegistry.ts @@ -48,7 +48,7 @@ class MetadataRegistryLookup { this._types = types; } - protected hasItemAt (index: number, variant: MetaRegistryItem): boolean { + protected _hasItemAt (index: number, variant: MetaRegistryItem): boolean { switch (variant) { case MetaRegistryItem.String: return this._strings && !!this._strings[index - 1]; @@ -59,8 +59,8 @@ class MetadataRegistryLookup { } } - protected itemAt (index: number, variant: MetaRegistryItem): any { - assert(this.hasItemAt(index, variant), `MetaRegistry: Invalid ${variant} index ${index} found in metadata`); + protected _itemAt (index: number, variant: MetaRegistryItem): any { + assert(this._hasItemAt(index, variant), `MetaRegistry: Invalid ${variant} index ${index} found in metadata`); switch (variant) { case MetaRegistryItem.String: @@ -72,33 +72,33 @@ class MetadataRegistryLookup { } } - protected itemsAt (indices: number[], variant: MetaRegistryItem): any[] { - return indices.map((index: number): string => this.itemAt(index, variant)); + protected _itemsAt (indices: number[], variant: MetaRegistryItem): any[] { + return indices.map((index: number): string => this._itemAt(index, variant)); } - protected stringAt (index: StringIndex): string { - return this.itemAt(index, MetaRegistryItem.String); + protected _stringAt (index: StringIndex): string { + return this._itemAt(index, MetaRegistryItem.String); } public stringsAt (indices: StringIndex[]): string[] { - return this.itemsAt(indices, MetaRegistryItem.String); + return this._itemsAt(indices, MetaRegistryItem.String); } public typeAt (index: TypeIndex): MetaType { - return this.itemAt(index, MetaRegistryItem.Type); + return this._itemAt(index, MetaRegistryItem.Type); } public typesAt (indices: TypeIndex[]): MetaType[] { - return this.itemsAt(indices, MetaRegistryItem.Type); + return this._itemsAt(indices, MetaRegistryItem.Type); } public hasTypeDefAt (index: TypeIndex): boolean { - return this.hasItemAt(index, MetaRegistryItem.TypeDef); + return this._hasItemAt(index, MetaRegistryItem.TypeDef); } public typeDefAt (index: TypeIndex, extra: Pick = {}): TypeDef { return { - ...this.itemAt(index, MetaRegistryItem.TypeDef), + ...this._itemAt(index, MetaRegistryItem.TypeDef), ...extra }; } @@ -124,7 +124,7 @@ export default class MetaRegistry extends MetadataRegistryLookup { } return { - name: this.stringAt(nameIndex), + name: this._stringAt(nameIndex), ...(namespaceIndices && namespaceIndices.length ? { namespace: this.stringsAt(namespaceIndices).join('::') } : {} @@ -195,7 +195,7 @@ export default class MetaRegistry extends MetadataRegistryLookup { if (unitNameIndex) { return { info: TypeDefInfo.Plain, - name: this.stringAt(unitNameIndex), + name: this._stringAt(unitNameIndex), type: 'Null' }; } @@ -269,7 +269,7 @@ export default class MetaRegistry extends MetadataRegistryLookup { } private typeDefForEnum (def: MetaTypeDefEnum, id: MetaTypeIdCustom, typeIndex?: TypeIndex): Pick { - const name = id && this.stringAt(id['custom.name']); + const name = id && this._stringAt(id['custom.name']); switch (name) { case 'Option': @@ -295,7 +295,7 @@ export default class MetaRegistry extends MetadataRegistryLookup { sub: def['clike_enum.variants'].map(({ discriminant, name: nameIndex }): TypeDef => ({ ext: { discriminant }, info: TypeDefInfo.Plain, - name: this.stringAt(nameIndex), + name: this._stringAt(nameIndex), type: 'Null' })) }; @@ -326,12 +326,12 @@ export default class MetaRegistry extends MetadataRegistryLookup { return withTypeString({ info: TypeDefInfo.Struct, ...(structNameIndex - ? { name: this.stringAt(structNameIndex) } + ? { name: this._stringAt(structNameIndex) } : {} ), sub: structFields.map((field: MetaTypeDefStructField): TypeDef => ({ ...this.typeDefFromMetaTypeAt(field.type), - name: this.stringAt(field.name) + name: this._stringAt(field.name) })) }); } @@ -343,7 +343,7 @@ export default class MetaRegistry extends MetadataRegistryLookup { return withTypeString({ info: TypeDefInfo.Tuple, ...(tupleStructNameIndex - ? { name: this.stringAt(tupleStructNameIndex) } + ? { name: this._stringAt(tupleStructNameIndex) } : {} ), sub: tupleStructTypes.map((fieldIndex: number, index: number): TypeDef => ({ diff --git a/packages/api-contract/src/base/Blueprint.ts b/packages/api-contract/src/base/Blueprint.ts index 3b7149994b..789ad47482 100644 --- a/packages/api-contract/src/base/Blueprint.ts +++ b/packages/api-contract/src/base/Blueprint.ts @@ -49,7 +49,7 @@ export default class Blueprint extends BaseWithTx => { - return this.apiContracts + return this._apiContracts .create(endowment, maxGas, this.codeHash, this.abi.constructors[constructorIndex](...params)) .signAndSend(account) .pipe(map(this.createResult)); diff --git a/packages/api-contract/src/base/Code.ts b/packages/api-contract/src/base/Code.ts index 6029afdab0..0c693e2227 100644 --- a/packages/api-contract/src/base/Code.ts +++ b/packages/api-contract/src/base/Code.ts @@ -48,7 +48,7 @@ export default class Code extends BaseWithTx return { signAndSend: this.decorateMethod( (account: IKeyringPair | string | AccountId | Address): CodePutCodeResultSubscription => - this.apiContracts + this._apiContracts .putCode(maxGas, compactAddLength(this.code)) .signAndSend(account) .pipe(map(this.createResult)) diff --git a/packages/api-contract/src/base/Contract.ts b/packages/api-contract/src/base/Contract.ts index a2d5cd0cd7..024e9f873d 100644 --- a/packages/api-contract/src/base/Contract.ts +++ b/packages/api-contract/src/base/Contract.ts @@ -42,7 +42,7 @@ export default class Contract extends BaseWithTxAndRpc send: this.decorateMethod( as === 'rpc' && this.hasRpcContractsCall ? (account: IKeyringPair | string | AccountId | Address): ContractCallResult<'rpc'> => - this.rpcContractsCall( + this._rpcContractsCall( this.registry.createType('ContractCallRequest', { dest: this.address.toString(), gasLimit, @@ -54,7 +54,7 @@ export default class Contract extends BaseWithTxAndRpc this.createOutcome(result, this.registry.createType('AccountId', account), def, params) )) : (account: IKeyringPair | string | AccountId | Address): ContractCallResult<'tx'> => - this.apiContracts + this._apiContracts .call(this.address, value, gasLimit, fn(...params)) .signAndSend(account) ) diff --git a/packages/api-contract/src/base/util.ts b/packages/api-contract/src/base/util.ts index df45d7a032..843eb31a95 100644 --- a/packages/api-contract/src/base/util.ts +++ b/packages/api-contract/src/base/util.ts @@ -55,7 +55,7 @@ export abstract class Base implements ContractBase extends Base { - protected get apiContracts (): SubmittableModuleExtrinsics<'rxjs'> { + protected get _apiContracts (): SubmittableModuleExtrinsics<'rxjs'> { return this.api.rx.tx.contracts; } @@ -71,7 +71,7 @@ export abstract class BaseWithTxAndRpcCall extends Bas return isFunction(this.api.rx.rpc.contracts?.call); } - protected get rpcContractsCall (): DecoratedRpc<'rxjs', RpcInterface>['contracts']['call'] { + protected get _rpcContractsCall (): DecoratedRpc<'rxjs', RpcInterface>['contracts']['call'] { assert(this.hasRpcContractsCall, 'You need to connect to a node with the contracts.call RPC method.'); return this.api.rx.rpc.contracts.call; diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts index bc792d7207..3a7d8c35f5 100644 --- a/packages/api/src/base/Decorate.ts +++ b/packages/api/src/base/Decorate.ts @@ -53,7 +53,7 @@ export default abstract class Decorate extends Events protected _consts: Constants = {} as Constants; - protected _derive?: ReturnType['decorateDerive']>; + protected _derive?: ReturnType['_decorateDerive']>; protected _extrinsics?: SubmittableExtrinsics; @@ -105,7 +105,7 @@ export default abstract class Decorate extends Events * implemented by transforming the Observable to Stream/Iterator/Kefir/Bacon * via `decorateMethod`. */ - protected decorateMethod: DecorateMethod; + protected _decorateMethod: DecorateMethod; /** * @description Create an instance of the class @@ -134,7 +134,7 @@ export default abstract class Decorate extends Events ? options.source._rpcCore.provider.clone() : (options.provider || new WsProvider()); - this.decorateMethod = decorateMethod; + this._decorateMethod = decorateMethod; this._options = options; this._type = type; this._rpcCore = new RpcCore(this.registry, thisProvider, this._options.rpc); @@ -168,19 +168,19 @@ export default abstract class Decorate extends Events const decoratedMeta = new DecoratedMeta(this.registry, metadata); if (fromEmpty || !this._extrinsics) { - this._extrinsics = this.decorateExtrinsics(decoratedMeta.tx, this.decorateMethod); - this._rx.tx = this.decorateExtrinsics(decoratedMeta.tx, this.rxDecorateMethod); + this._extrinsics = this._decorateExtrinsics(decoratedMeta.tx, this._decorateMethod); + this._rx.tx = this._decorateExtrinsics(decoratedMeta.tx, this._rxDecorateMethod); } else { - augmentObject('tx', this.decorateExtrinsics(decoratedMeta.tx, this.decorateMethod), this._extrinsics, false); - augmentObject('', this.decorateExtrinsics(decoratedMeta.tx, this.rxDecorateMethod), this._rx.tx, false); + augmentObject('tx', this._decorateExtrinsics(decoratedMeta.tx, this._decorateMethod), this._extrinsics, false); + augmentObject('', this._decorateExtrinsics(decoratedMeta.tx, this._rxDecorateMethod), this._rx.tx, false); } // this API - augmentObject('query', this.decorateStorage(decoratedMeta.query, this.decorateMethod), this._query, fromEmpty); + augmentObject('query', this._decorateStorage(decoratedMeta.query, this._decorateMethod), this._query, fromEmpty); augmentObject('consts', decoratedMeta.consts, this._consts, fromEmpty); // rx - augmentObject('', this.decorateStorage(decoratedMeta.query, this.rxDecorateMethod), this._rx.query, fromEmpty); + augmentObject('', this._decorateStorage(decoratedMeta.query, this._rxDecorateMethod), this._rx.query, fromEmpty); augmentObject('', decoratedMeta.consts, this._rx.consts, fromEmpty); } @@ -201,7 +201,7 @@ export default abstract class Decorate extends Events // manner to cater for both old and new: // - when the number of entries are 0, only remove the ones with isOptional (account & contracts) // - when non-zero, remove anything that is not in the array (we don't do this) - protected async filterRpc (): Promise { + protected async _filterRpc (): Promise { let methods: string[]; try { @@ -212,10 +212,10 @@ export default abstract class Decorate extends Events methods = []; } - this.filterRpcMethods(methods); + this._filterRpcMethods(methods); } - protected filterRpcMethods (exposed: string[]): void { + protected _filterRpcMethods (exposed: string[]): void { const hasResults = exposed.length !== 0; const allKnown = [...this._rpcCore.mapping.entries()]; const allKeys = allKnown.reduce((allKeys: string[], [, { alias, method, pubsub, section }]): string[] => { @@ -253,7 +253,7 @@ export default abstract class Decorate extends Events }); } - protected decorateRpc (rpc: RpcCore, decorateMethod: DecorateMethod): DecoratedRpc { + protected _decorateRpc (rpc: RpcCore, decorateMethod: DecorateMethod): DecoratedRpc { return rpc.sections.reduce((out, _sectionName): DecoratedRpc => { const sectionName = _sectionName as keyof DecoratedRpc; @@ -272,7 +272,7 @@ export default abstract class Decorate extends Events }, {} as DecoratedRpc); } - protected decorateMulti (decorateMethod: DecorateMethod): QueryableStorageMulti { + protected _decorateMulti (decorateMethod: DecorateMethod): QueryableStorageMulti { return decorateMethod((calls: QueryableStorageMultiArg[]): Observable => this._rpcCore.state.subscribeStorage( calls.map((arg: QueryableStorageMultiArg): [QueryableStorageEntry, ...Arg[]] => @@ -282,12 +282,12 @@ export default abstract class Decorate extends Events : [arg.creator] as any))); } - protected decorateExtrinsics (extrinsics: ModulesWithCalls, decorateMethod: DecorateMethod): SubmittableExtrinsics { + protected _decorateExtrinsics (extrinsics: ModulesWithCalls, decorateMethod: DecorateMethod): SubmittableExtrinsics { const creator = createSubmittable(this._type, this._rx, decorateMethod); return Object.entries(extrinsics).reduce((out, [name, section]): SubmittableExtrinsics => { out[name] = Object.entries(section).reduce((out, [name, method]): SubmittableModuleExtrinsics => { - out[name] = this.decorateExtrinsicEntry(method, creator); + out[name] = this._decorateExtrinsicEntry(method, creator); return out; }, {} as SubmittableModuleExtrinsics); @@ -296,17 +296,17 @@ export default abstract class Decorate extends Events }, creator as SubmittableExtrinsics); } - private decorateExtrinsicEntry (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic): SubmittableExtrinsicFunction { + private _decorateExtrinsicEntry (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic): SubmittableExtrinsicFunction { const decorated = (...params: Arg[]): SubmittableExtrinsic => creator(method(...params)); return this.decorateFunctionMeta(method, decorated as any) as SubmittableExtrinsicFunction; } - protected decorateStorage (storage: Storage, decorateMethod: DecorateMethod): QueryableStorage { + protected _decorateStorage (storage: Storage, decorateMethod: DecorateMethod): QueryableStorage { return Object.entries(storage).reduce((out, [name, section]): QueryableStorage => { out[name] = Object.entries(section).reduce((out, [name, method]): QueryableModuleStorage => { - out[name] = this.decorateStorageEntry(method, decorateMethod); + out[name] = this._decorateStorageEntry(method, decorateMethod); return out; }, {} as QueryableModuleStorage); @@ -315,7 +315,7 @@ export default abstract class Decorate extends Events }, {} as QueryableStorage); } - private decorateStorageEntry (creator: StorageEntry, decorateMethod: DecorateMethod): QueryableStorageEntry { + private _decorateStorageEntry (creator: StorageEntry, decorateMethod: DecorateMethod): QueryableStorageEntry { // get the storage arguments, with DoubleMap as an array entry, otherwise spread const getArgs = (...args: any[]): any[] => extractStorageArgs(creator, args); @@ -528,14 +528,14 @@ export default abstract class Decorate extends Events ); } - protected decorateDeriveRx (decorateMethod: DecorateMethod): DeriveAllSections<'rxjs', ExactDerive> { + protected _decorateDeriveRx (decorateMethod: DecorateMethod): DeriveAllSections<'rxjs', ExactDerive> { // Pull in derive from api-derive const derive = decorateDerive(this._rx, this._options.derives); return decorateSections<'rxjs', ExactDerive>(derive, decorateMethod); } - protected decorateDerive (decorateMethod: DecorateMethod): DeriveAllSections { + protected _decorateDerive (decorateMethod: DecorateMethod): DeriveAllSections { return decorateSections(this._rx.derive, decorateMethod); } @@ -543,7 +543,7 @@ export default abstract class Decorate extends Events * Put the `this.onCall` function of ApiRx here, because it is needed by * `api._rx`. */ - protected rxDecorateMethod = (method: Method): Method => { + protected _rxDecorateMethod = (method: Method): Method => { return method; } } diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts index 06bd8b139d..09279f2576 100644 --- a/packages/api/src/base/Init.ts +++ b/packages/api/src/base/Init.ts @@ -48,10 +48,10 @@ export default abstract class Init extends Decorate extends Decorate { + protected async _loadMeta (): Promise { const genesisHash = await this._rpcCore.chain.getBlockHash(0).toPromise(); // on re-connection to the same chain, we don't want to re-do everything from chain again @@ -112,7 +112,7 @@ export default abstract class Init extends Decorate extends Decorate extends Decorate extends Decorate extends Init['decorateDerive']> { + public get derive (): ReturnType['_decorateDerive']> { return assertResult(this._derive); } diff --git a/packages/api/src/promise/Api.spec.ts b/packages/api/src/promise/Api.spec.ts index 0dd02c62d4..d6898fffd9 100644 --- a/packages/api/src/promise/Api.spec.ts +++ b/packages/api/src/promise/Api.spec.ts @@ -89,7 +89,7 @@ describe('ApiPromise', (): void => { super({ provider }); } - protected loadMeta (): Promise { + protected _loadMeta (): Promise { throw new Error('Simulate failure to load meta'); } } diff --git a/packages/api/src/promise/Combinator.ts b/packages/api/src/promise/Combinator.ts index 0c1c1ef743..d568a4ec3b 100644 --- a/packages/api/src/promise/Combinator.ts +++ b/packages/api/src/promise/Combinator.ts @@ -40,11 +40,11 @@ export default class Combinator { this.#fns.push(fn); // Not quite 100% how to have a variable number at the front here - return (fn as Function)(...args, this.createCallback(index)); + return (fn as Function)(...args, this._createCallback(index)); }); } - protected allHasFired (): boolean { + protected _allHasFired (): boolean { if (!this.#allHasFired) { this.#allHasFired = this.#fired.filter((hasFired): boolean => !hasFired).length === 0; } @@ -52,17 +52,17 @@ export default class Combinator { return this.#allHasFired; } - protected createCallback (index: number): (value: any) => void { + protected _createCallback (index: number): (value: any) => void { return (value: any): void => { this.#fired[index] = true; this.#results[index] = value; - this.triggerUpdate(); + this._triggerUpdate(); }; } - protected triggerUpdate (): void { - if (!this.#isActive || !isFunction(this.#callback) || !this.allHasFired()) { + protected _triggerUpdate (): void { + if (!this.#isActive || !isFunction(this.#callback) || !this._allHasFired()) { return; } diff --git a/packages/api/src/submittable/createClass.ts b/packages/api/src/submittable/createClass.ts index ac269651eb..d77bc969c8 100644 --- a/packages/api/src/submittable/createClass.ts +++ b/packages/api/src/submittable/createClass.ts @@ -20,7 +20,7 @@ import SubmittableResult from './Result'; interface SubmittableOptions { api: ApiInterfaceRx; apiType: ApiTypes; - decorateMethod: ApiBase['decorateMethod']; + decorateMethod: ApiBase['_decorateMethod']; } export default function createClass ({ api, apiType, decorateMethod }: SubmittableOptions): Constructor> { diff --git a/packages/api/src/submittable/createSubmittable.ts b/packages/api/src/submittable/createSubmittable.ts index 5ee3336947..3415df7639 100644 --- a/packages/api/src/submittable/createSubmittable.ts +++ b/packages/api/src/submittable/createSubmittable.ts @@ -14,7 +14,7 @@ type Creator = (extrinsic: Call | Uint8Array | string) let Submittable: Constructor>; -export default function createSubmittable (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase['decorateMethod']): Creator { +export default function createSubmittable (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase['_decorateMethod']): Creator { return (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic => { // This is not great, but basically what we do here is to only require the // class right at the point it is actually needed - delaying initialization diff --git a/packages/types/src/codec/Enum.ts b/packages/types/src/codec/Enum.ts index 6e78eb2466..3b6ba5afb9 100644 --- a/packages/types/src/codec/Enum.ts +++ b/packages/types/src/codec/Enum.ts @@ -289,7 +289,7 @@ export default class Enum extends Base { /** * @description Returns a raw struct representation of the enum types */ - protected toRawStruct (): string[] | Record { + protected _toRawStruct (): string[] | Record { return this._isBasic ? this.defKeys : Struct.typesToMap(this.registry, this._def); @@ -299,7 +299,7 @@ export default class Enum extends Base { * @description Returns the base runtime type name for this instance */ public toRawType (): string { - return JSON.stringify({ _enum: this.toRawStruct() }); + return JSON.stringify({ _enum: this._toRawStruct() }); } /** diff --git a/packages/types/src/codec/Result.ts b/packages/types/src/codec/Result.ts index 109bd13126..8cc1bf7577 100644 --- a/packages/types/src/codec/Result.ts +++ b/packages/types/src/codec/Result.ts @@ -71,7 +71,7 @@ export default class Result extends Enum { * @description Returns the base runtime type name for this instance */ public toRawType (): string { - const Types = this.toRawStruct() as { Ok: any; Error: any }; + const Types = this._toRawStruct() as { Ok: any; Error: any }; return `Result<${Types.Ok},${Types.Error}>`; } diff --git a/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts index c4aade5df8..86f3fb45a8 100644 --- a/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v2/ExtrinsicSignature.ts @@ -94,7 +94,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi return this.get('tip') as Compact; } - protected injectSignature (signer: Address, signature: Signature, { era, nonce, tip }: ExtrinsicPayloadV2): IExtrinsicSignature { + protected _injectSignature (signer: Address, signature: Signature, { era, nonce, tip }: ExtrinsicPayloadV2): IExtrinsicSignature { this.set('era', era); this.set('nonce', nonce); this.set('signer', signer); @@ -108,7 +108,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi * @description Adds a raw signature */ public addSignature (signer: Address | Uint8Array | string, signature: Uint8Array | string, payload: ExtrinsicPayloadValue | Uint8Array | string): IExtrinsicSignature { - return this.injectSignature( + return this._injectSignature( this.registry.createType('Address', signer), this.registry.createType('Signature', signature), new ExtrinsicPayloadV2(this.registry, payload) @@ -138,7 +138,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi const payload = this.createPayload(method, options); const signature = this.registry.createType('Signature', payload.sign(account)); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } /** @@ -149,7 +149,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi const payload = this.createPayload(method, options); const signature = this.registry.createType('Signature', new Uint8Array(64).fill(0x42)); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } /** diff --git a/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts index 86bddef73c..308b9c00fd 100644 --- a/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v3/ExtrinsicSignature.ts @@ -19,7 +19,7 @@ export default class ExtrinsicSignatureV3 extends ExtrinsicSignatureV2 { * @description Adds a raw signature */ public addSignature (signer: Address | Uint8Array | string, signature: Uint8Array | string, payload: ExtrinsicPayloadValue | Uint8Array | string): IExtrinsicSignature { - return this.injectSignature( + return this._injectSignature( this.registry.createType('Address', signer), this.registry.createType('Signature', signature), new ExtrinsicPayloadV3(this.registry, payload) @@ -49,7 +49,7 @@ export default class ExtrinsicSignatureV3 extends ExtrinsicSignatureV2 { const payload = this.createPayload(method, options); const signature = this.registry.createType('Signature', payload.sign(account)); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } /** @@ -60,6 +60,6 @@ export default class ExtrinsicSignatureV3 extends ExtrinsicSignatureV2 { const payload = this.createPayload(method, options); const signature = this.registry.createType('Signature', new Uint8Array(64).fill(0x42)); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } } diff --git a/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts index 8ea103f2e2..e5790211f8 100644 --- a/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts +++ b/packages/types/src/extrinsic/v4/ExtrinsicSignature.ts @@ -100,7 +100,7 @@ export default class ExtrinsicSignatureV4 extends Struct implements IExtrinsicSi return this.get('tip') as Compact; } - protected injectSignature (signer: Address, signature: MultiSignature, { era, nonce, tip }: ExtrinsicPayloadV4): IExtrinsicSignature { + protected _injectSignature (signer: Address, signature: MultiSignature, { era, nonce, tip }: ExtrinsicPayloadV4): IExtrinsicSignature { this.set('era', era); this.set('nonce', nonce); this.set('signer', signer); @@ -114,7 +114,7 @@ export default class ExtrinsicSignatureV4 extends Struct implements IExtrinsicSi * @description Adds a raw signature */ public addSignature (signer: Address | Uint8Array | string, signature: Uint8Array | string, payload: ExtrinsicPayloadValue | Uint8Array | string): IExtrinsicSignature { - return this.injectSignature( + return this._injectSignature( this.registry.createType('Address', signer), this.registry.createType('MultiSignature', signature), new ExtrinsicPayloadV4(this.registry, payload) @@ -144,7 +144,7 @@ export default class ExtrinsicSignatureV4 extends Struct implements IExtrinsicSi const payload = this.createPayload(method, options); const signature = this.registry.createType('MultiSignature', payload.sign(account)); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } /** @@ -155,7 +155,7 @@ export default class ExtrinsicSignatureV4 extends Struct implements IExtrinsicSi const payload = this.createPayload(method, options); const signature = this.registry.createType('MultiSignature', u8aConcat(new Uint8Array([1]), new Uint8Array(64).fill(0x42))); - return this.injectSignature(signer, signature, payload); + return this._injectSignature(signer, signature, payload); } /**