quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indicate all protected members and variables (#2154)

Browse Source 
* Indicate all protected members and variables

* Added dropped protected
This commit is contained in:
Jaco Greeff
2020-04-10 14:29:58 +02:00
committed by GitHub
parent 245047a41f
commit 5ab24390c5
18 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-contract/src/ContractRegistry.ts
+7 -7
View File
@@ -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)
};
packages/api-contract/src/MetaRegistry.ts
+19 -19
View File
@@ -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, never> = {}): 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<TypeDef, any> {
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 => ({
packages/api-contract/src/base/Blueprint.ts
+1 -1
View File
@@ -49,7 +49,7 @@ export default class Blueprint<ApiType extends ApiTypes> extends BaseWithTx<ApiT
return {
signAndSend: this.decorateMethod(
(account: IKeyringPair | string | AccountId | Address): BlueprintCreateResultSubscription<ApiType> => {
return this.apiContracts
return this._apiContracts
.create(endowment, maxGas, this.codeHash, this.abi.constructors[constructorIndex](...params))
.signAndSend(account)
.pipe(map(this.createResult));
packages/api-contract/src/base/Code.ts
+1 -1
View File
@@ -48,7 +48,7 @@ export default class Code<ApiType extends ApiTypes> extends BaseWithTx<ApiType>
return {
signAndSend: this.decorateMethod(
(account: IKeyringPair | string | AccountId | Address): CodePutCodeResultSubscription<ApiType> =>
this.apiContracts
this._apiContracts
.putCode(maxGas, compactAddLength(this.code))
.signAndSend(account)
.pipe(map(this.createResult))
packages/api-contract/src/base/Contract.ts
+2 -2
View File
@@ -42,7 +42,7 @@ export default class Contract<ApiType extends ApiTypes> 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<ApiType extends ApiTypes> 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)
)
packages/api-contract/src/base/util.ts
+2 -2
View File
@@ -55,7 +55,7 @@ export abstract class Base<ApiType extends ApiTypes> implements ContractBase<Api
}
export abstract class BaseWithTx<ApiType extends ApiTypes> extends Base<ApiType> {
protected get apiContracts (): SubmittableModuleExtrinsics<'rxjs'> {
protected get _apiContracts (): SubmittableModuleExtrinsics<'rxjs'> {
return this.api.rx.tx.contracts;
}
@@ -71,7 +71,7 @@ export abstract class BaseWithTxAndRpcCall<ApiType extends ApiTypes> 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;
packages/api/src/base/Decorate.ts
+23 -23
View File
@@ -53,7 +53,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
protected _consts: Constants = {} as Constants;
protected _derive?: ReturnType<Decorate<ApiType>['decorateDerive']>;
protected _derive?: ReturnType<Decorate<ApiType>['_decorateDerive']>;
protected _extrinsics?: SubmittableExtrinsics<ApiType>;
@@ -105,7 +105,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
* implemented by transforming the Observable to Stream/Iterator/Kefir/Bacon
* via `decorateMethod`.
*/
protected decorateMethod: DecorateMethod<ApiType>;
protected _decorateMethod: DecorateMethod<ApiType>;
/**
* @description Create an instance of the class
@@ -134,7 +134,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> 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<ApiType extends ApiTypes> 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<ApiType extends ApiTypes> 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<void> {
protected async _filterRpc (): Promise<void> {
let methods: string[];
try {
@@ -212,10 +212,10 @@ export default abstract class Decorate<ApiType extends ApiTypes> 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<ApiType extends ApiTypes> extends Events
});
}
protected decorateRpc<ApiType extends ApiTypes> (rpc: RpcCore, decorateMethod: DecorateMethod<ApiType>): DecoratedRpc<ApiType, RpcInterface> {
protected _decorateRpc<ApiType extends ApiTypes> (rpc: RpcCore, decorateMethod: DecorateMethod<ApiType>): DecoratedRpc<ApiType, RpcInterface> {
return rpc.sections.reduce((out, _sectionName): DecoratedRpc<ApiType, RpcInterface> => {
const sectionName = _sectionName as keyof DecoratedRpc<ApiType, RpcInterface>;
@@ -272,7 +272,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
}, {} as DecoratedRpc<ApiType, RpcInterface>);
}
protected decorateMulti<ApiType extends ApiTypes> (decorateMethod: DecorateMethod<ApiType>): QueryableStorageMulti<ApiType> {
protected _decorateMulti<ApiType extends ApiTypes> (decorateMethod: DecorateMethod<ApiType>): QueryableStorageMulti<ApiType> {
return decorateMethod((calls: QueryableStorageMultiArg<ApiType>[]): Observable<Codec[]> =>
this._rpcCore.state.subscribeStorage(
calls.map((arg: QueryableStorageMultiArg<ApiType>): [QueryableStorageEntry<ApiType>, ...Arg[]] =>
@@ -282,12 +282,12 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
: [arg.creator] as any)));
}
protected decorateExtrinsics<ApiType extends ApiTypes> (extrinsics: ModulesWithCalls, decorateMethod: DecorateMethod<ApiType>): SubmittableExtrinsics<ApiType> {
protected _decorateExtrinsics<ApiType extends ApiTypes> (extrinsics: ModulesWithCalls, decorateMethod: DecorateMethod<ApiType>): SubmittableExtrinsics<ApiType> {
const creator = createSubmittable(this._type, this._rx, decorateMethod);
return Object.entries(extrinsics).reduce((out, [name, section]): SubmittableExtrinsics<ApiType> => {
out[name] = Object.entries(section).reduce((out, [name, method]): SubmittableModuleExtrinsics<ApiType> => {
out[name] = this.decorateExtrinsicEntry(method, creator);
out[name] = this._decorateExtrinsicEntry(method, creator);
return out;
}, {} as SubmittableModuleExtrinsics<ApiType>);
@@ -296,17 +296,17 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
}, creator as SubmittableExtrinsics<ApiType>);
}
private decorateExtrinsicEntry<ApiType extends ApiTypes> (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic<ApiType>): SubmittableExtrinsicFunction<ApiType> {
private _decorateExtrinsicEntry<ApiType extends ApiTypes> (method: CallFunction, creator: (value: Call | Uint8Array | string) => SubmittableExtrinsic<ApiType>): SubmittableExtrinsicFunction<ApiType> {
const decorated = (...params: Arg[]): SubmittableExtrinsic<ApiType> =>
creator(method(...params));
return this.decorateFunctionMeta(method, decorated as any) as SubmittableExtrinsicFunction<ApiType>;
}
protected decorateStorage<ApiType extends ApiTypes> (storage: Storage, decorateMethod: DecorateMethod<ApiType>): QueryableStorage<ApiType> {
protected _decorateStorage<ApiType extends ApiTypes> (storage: Storage, decorateMethod: DecorateMethod<ApiType>): QueryableStorage<ApiType> {
return Object.entries(storage).reduce((out, [name, section]): QueryableStorage<ApiType> => {
out[name] = Object.entries(section).reduce((out, [name, method]): QueryableModuleStorage<ApiType> => {
out[name] = this.decorateStorageEntry(method, decorateMethod);
out[name] = this._decorateStorageEntry(method, decorateMethod);
return out;
}, {} as QueryableModuleStorage<ApiType>);
@@ -315,7 +315,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
}, {} as QueryableStorage<ApiType>);
}
private decorateStorageEntry<ApiType extends ApiTypes> (creator: StorageEntry, decorateMethod: DecorateMethod<ApiType>): QueryableStorageEntry<ApiType> {
private _decorateStorageEntry<ApiType extends ApiTypes> (creator: StorageEntry, decorateMethod: DecorateMethod<ApiType>): QueryableStorageEntry<ApiType> {
// 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<ApiType extends ApiTypes> extends Events
);
}
protected decorateDeriveRx (decorateMethod: DecorateMethod<ApiType>): DeriveAllSections<'rxjs', ExactDerive> {
protected _decorateDeriveRx (decorateMethod: DecorateMethod<ApiType>): 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<ApiType>): DeriveAllSections<ApiType, ExactDerive> {
protected _decorateDerive (decorateMethod: DecorateMethod<ApiType>): DeriveAllSections<ApiType, ExactDerive> {
return decorateSections<ApiType, ExactDerive>(this._rx.derive, decorateMethod);
}
@@ -543,7 +543,7 @@ export default abstract class Decorate<ApiType extends ApiTypes> extends Events
* Put the `this.onCall` function of ApiRx here, because it is needed by
* `api._rx`.
*/
protected rxDecorateMethod = <Method extends AnyFunction>(method: Method): Method => {
protected _rxDecorateMethod = <Method extends AnyFunction>(method: Method): Method => {
return method;
}
}
packages/api/src/base/Init.ts
+10 -10
View File
@@ -48,10 +48,10 @@ export default abstract class Init<ApiType extends ApiTypes> extends Decorate<Ap
this.registry.setKnownTypes(options.source.registry.knownTypes);
}
this._rpc = this.decorateRpc(this._rpcCore, this.decorateMethod);
this._rx.rpc = this.decorateRpc(this._rpcCore, this.rxDecorateMethod);
this._queryMulti = this.decorateMulti(this.decorateMethod);
this._rx.queryMulti = this.decorateMulti(this.rxDecorateMethod);
this._rpc = this._decorateRpc(this._rpcCore, this._decorateMethod);
this._rx.rpc = this._decorateRpc(this._rpcCore, this._rxDecorateMethod);
this._queryMulti = this._decorateMulti(this._decorateMethod);
this._rx.queryMulti = this._decorateMulti(this._rxDecorateMethod);
this._rx.signer = options.signer;
this._rpcCore.provider.on('disconnected', this.#onProviderDisconnect);
@@ -66,7 +66,7 @@ export default abstract class Init<ApiType extends ApiTypes> extends Decorate<Ap
}
}
protected async loadMeta (): Promise<boolean> {
protected async _loadMeta (): Promise<boolean> {
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<ApiType extends ApiTypes> extends Decorate<Ap
});
});
this.filterRpcMethods(methods);
this._filterRpcMethods(methods);
return source.runtimeMetadata;
}
@@ -165,7 +165,7 @@ export default abstract class Init<ApiType extends ApiTypes> extends Decorate<Ap
this.subscribeUpdates();
// filter the RPC methods (this does an rpc-methods call)
await this.filterRpc();
await this._filterRpc();
// retrieve metadata, either from chain or as pass-in via options
const metadataKey = `${this._genesisHash}-${runtimeVersion.specVersion}`;
@@ -203,8 +203,8 @@ export default abstract class Init<ApiType extends ApiTypes> extends Decorate<Ap
this.injectMetadata(metadata, true);
// derive is last, since it uses the decorated rx
this._rx.derive = this.decorateDeriveRx(this.rxDecorateMethod);
this._derive = this.decorateDerive(this.decorateMethod);
this._rx.derive = this._decorateDeriveRx(this._rxDecorateMethod);
this._derive = this._decorateDerive(this._decorateMethod);
return true;
}
@@ -215,7 +215,7 @@ export default abstract class Init<ApiType extends ApiTypes> extends Decorate<Ap
try {
const [hasMeta, cryptoReady] = await Promise.all([
this.loadMeta(),
this._loadMeta(),
this._options.initWasm === false
? Promise.resolve(true)
: cryptoWaitReady()
packages/api/src/base/index.ts
+1 -1
View File
@@ -93,7 +93,7 @@ export default abstract class ApiBase<ApiType extends ApiTypes> extends Init<Api
* });
* ```
*/
public get derive (): ReturnType<ApiBase<ApiType>['decorateDerive']> {
public get derive (): ReturnType<ApiBase<ApiType>['_decorateDerive']> {
return assertResult(this._derive);
}
packages/api/src/promise/Api.spec.ts
+1 -1
View File
@@ -89,7 +89,7 @@ describe('ApiPromise', (): void => {
super({ provider });
}
protected loadMeta (): Promise<boolean> {
protected _loadMeta (): Promise<boolean> {
throw new Error('Simulate failure to load meta');
}
}
packages/api/src/promise/Combinator.ts
+6 -6
View File
@@ -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;
}
packages/api/src/submittable/createClass.ts
+1 -1
View File
@@ -20,7 +20,7 @@ import SubmittableResult from './Result';
interface SubmittableOptions<ApiType extends ApiTypes> {
api: ApiInterfaceRx;
apiType: ApiTypes;
decorateMethod: ApiBase<ApiType>['decorateMethod'];
decorateMethod: ApiBase<ApiType>['_decorateMethod'];
}
export default function createClass <ApiType extends ApiTypes> ({ api, apiType, decorateMethod }: SubmittableOptions<ApiType>): Constructor<SubmittableExtrinsic<ApiType>> {
packages/api/src/submittable/createSubmittable.ts
+1 -1
View File
@@ -14,7 +14,7 @@ type Creator<ApiType extends ApiTypes> = (extrinsic: Call | Uint8Array | string)
let Submittable: Constructor<SubmittableExtrinsic<any>>;
export default function createSubmittable<ApiType extends ApiTypes> (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase<ApiType>['decorateMethod']): Creator<ApiType> {
export default function createSubmittable<ApiType extends ApiTypes> (apiType: ApiTypes, api: ApiInterfaceRx, decorateMethod: ApiBase<ApiType>['_decorateMethod']): Creator<ApiType> {
return (extrinsic: Call | Extrinsic | Uint8Array | string): SubmittableExtrinsic<ApiType> => {
// 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
packages/types/src/codec/Enum.ts
+2 -2
View File
@@ -289,7 +289,7 @@ export default class Enum extends Base<Codec> {
/**
* @description Returns a raw struct representation of the enum types
*/
protected toRawStruct (): string[] | Record<string, string> {
protected _toRawStruct (): string[] | Record<string, string> {
return this._isBasic
? this.defKeys
: Struct.typesToMap(this.registry, this._def);
@@ -299,7 +299,7 @@ export default class Enum extends Base<Codec> {
* @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() });
}
/**
packages/types/src/codec/Result.ts
+1 -1
View File
@@ -71,7 +71,7 @@ export default class Result<O extends Codec, E extends Codec> 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}>`;
}
packages/types/src/extrinsic/v2/ExtrinsicSignature.ts
+4 -4
View File
@@ -94,7 +94,7 @@ export default class ExtrinsicSignatureV2 extends Struct implements IExtrinsicSi
return this.get('tip') as Compact<Balance>;
}
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);
}
/**
packages/types/src/extrinsic/v3/ExtrinsicSignature.ts
+3 -3
View File
@@ -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);
}
}
packages/types/src/extrinsic/v4/ExtrinsicSignature.ts
+4 -4
View File
@@ -100,7 +100,7 @@ export default class ExtrinsicSignatureV4 extends Struct implements IExtrinsicSi
return this.get('tip') as Compact<Balance>;
}
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);
}
/**