fix signedExtensions type (#3148)

This commit is contained in:
Nantian
2021-02-05 08:25:17 +01:00
committed by GitHub
parent 1e73f69253
commit 9100aabbac
4 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ export interface ApiOptions extends RegisteredTypes {
/**
* @description Any chain-specific signed extensions that are now well-known
*/
signedExtensions?: Record<string, ExtDef>;
signedExtensions?: ExtDef;
/**
* @description An external signer which will be used to sign extrinsic when account passed in is not KeyringPair
*/
+3 -3
View File
@@ -134,7 +134,7 @@ export class TypeRegistry implements Registry {
#signedExtensions: string[] = defaultExtensions;
#userExtensions?: Record<string, ExtDef>;
#userExtensions?: ExtDef;
constructor () {
this.#knownDefaults = { Json, Metadata, Raw, ...baseTypes };
@@ -377,7 +377,7 @@ export class TypeRegistry implements Registry {
}
// sets the metadata
public setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void {
public setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: ExtDef): void {
injectExtrinsics(this, metadata, this.#metadataCalls);
injectErrors(this, metadata, this.#metadataErrors);
injectEvents(this, metadata, this.#metadataEvents);
@@ -399,7 +399,7 @@ export class TypeRegistry implements Registry {
}
// sets the available signed extensions
setSignedExtensions (signedExtensions: string[] = defaultExtensions, userExtensions?: Record<string, ExtDef>): void {
setSignedExtensions (signedExtensions: string[] = defaultExtensions, userExtensions?: ExtDef): void {
this.#signedExtensions = signedExtensions;
this.#userExtensions = userExtensions;
@@ -26,15 +26,15 @@ const defaultExtensions: Array<keyof typeof allExtensions> = [
'CheckBlockGasLimit'
];
function findUnknownExtensions (extensions: string[], userExtensions: Record<string, ExtDef> = {}): string[] {
function findUnknownExtensions (extensions: string[], userExtensions: ExtDef = {}): string[] {
const names = [...Object.keys(allExtensions), ...Object.keys(userExtensions)];
return extensions.filter((key) => !names.includes(key));
}
function expandExtensionTypes (extensions: string[], type: keyof ExtInfo, userExtensions: Record<string, ExtDef> = {}): ExtTypes {
function expandExtensionTypes (extensions: string[], type: keyof ExtInfo, userExtensions: ExtDef = {}): ExtTypes {
return extensions
.map((key) => allExtensions[key] || userExtensions[key])
.map((key) => userExtensions[key] || allExtensions[key])
.filter((info): info is ExtInfo => !!info)
.reduce((result, info): ExtTypes => ({ ...result, ...info[type] }), {});
}
+2 -2
View File
@@ -116,6 +116,6 @@ export interface Registry {
register (arg1: string | Constructor | RegistryTypes, arg2?: Constructor): void;
setChainProperties (properties?: ChainProperties): void;
setHasher (hasher?: (data: Uint8Array) => Uint8Array): void;
setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
setSignedExtensions (signedExtensions?: string[], userExtensions?: Record<string, ExtDef>): void;
setMetadata (metadata: Metadata, signedExtensions?: string[], userExtensions?: ExtDef): void;
setSignedExtensions (signedExtensions?: string[], userExtensions?: ExtDef): void;
}