neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply DispatchResult component to Result<null, SpRuntimeDispatchError> (#7476)

Browse Source 
* Apply DispatchResult component to Result<null, SpRuntimeDispatchError>

* Adjust

* Additional

* Cleanup log
This commit is contained in:
Jaco 2022-04-28 11:08:44 +02:00 committed by GitHub
parent f4f1f49bdd
commit 2ba5f88388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
packages/react-params/src/Param/findComponent.ts
View File

@ -44,16 +44,18 @@ interface TypeToComponent {
const SPECIAL_TYPES = ['AccountId', 'AccountId32', 'AccountIndex', 'Address', 'Balance', 'BalanceOf', 'Vec<KeyValue>'];
const DISPATCH_ERROR = ['DispatchError', 'SpRuntimeDispatchError'];
const componentDef: TypeToComponent[] = [
{ c: Account, t: ['AccountId', 'AccountId32', 'Address', 'LookupSource'] },
{ c: Amount, t: ['AccountIndex', 'i8', 'i16', 'i32', 'i64', 'i128', 'u8', 'u16', 'u32', 'u64', 'u128', 'u256'] },
{ c: Balance, t: ['Amount', 'Balance', 'BalanceOf'] },
{ c: Bool, t: ['bool'] },
{ c: Bytes, t: ['Bytes'] },
{ c: Bytes, t: ['Bytes', 'Vec<u8>'] },
{ c: Call, t: ['Call', 'Proposal'] },
{ c: Code, t: ['Code'] },
{ c: DispatchError, t: ['DispatchError', 'SpRuntimeDispatchError'] },
{ c: DispatchResult, t: ['DispatchResult'] },
{ c: DispatchError, t: DISPATCH_ERROR },
{ c: DispatchResult, t: ['DispatchResult', 'Result<Null, SpRuntimeDispatchError>'] },
{ c: Raw, t: ['Raw', 'RuntimeSessionKeys', 'Keys'] },
{ c: Enum, t: ['Enum'] },
{ c: Hash256, t: ['Hash', 'H256'] },
@ -86,14 +88,14 @@ const components: ComponentMap = componentDef.reduce((components, { c, t }): Com
const warnList: string[] = [];
function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string {
// const nameOverride = displayName || typeName;
if (displayName && SPECIAL_TYPES.includes(displayName)) {
return displayName;
} else if (type.endsWith('RuntimeSessionKeys')) {
return 'RuntimeSessionKeys';
}
const typeValue = lookupName || type;
switch (info) {
case TypeDefInfo.Compact:
return (sub as TypeDef).type;
@ -104,34 +106,36 @@ function fromDef ({ displayName, info, lookupName, sub, type }: TypeDef): string
case TypeDefInfo.Enum:
return 'Enum';
case TypeDefInfo.Result: {
const [, errSub] = (sub as TypeDef[]);
return DISPATCH_ERROR.includes(errSub.lookupName || errSub.type)
? 'DispatchResult'
: typeValue;
}
case TypeDefInfo.Struct:
return 'Struct';
case TypeDefInfo.Tuple:
if (components[type] === Account) {
return type;
}
return 'Tuple';
return components[type] === Account
? type
: 'Tuple';
case TypeDefInfo.Vec:
if (type === 'Vec<u8>') {
return 'Bytes';
}
return ['Vec<KeyValue>'].includes(type)
? 'Vec<KeyValue>'
: 'Vec';
return type === 'Vec<u8>'
? 'Bytes'
: ['Vec<KeyValue>'].includes(type)
? 'Vec<KeyValue>'
: 'Vec';
case TypeDefInfo.VecFixed:
if ((sub as TypeDef).type === 'u8') {
return type;
}
return 'VecFixed';
return (sub as TypeDef).type === 'u8'
? type
: 'VecFixed';
default:
return lookupName || type;
return typeValue;
}
}
@ -140,6 +144,7 @@ export default function findComponent (registry: Registry, def: TypeDef, overrid
type
? overrides[type] || components[type]
: null;
const type = fromDef(def);
let Component = findOne(def.lookupName) || findOne(type);