Cleanups with DRY-er code (#4312)

* Cleanups with DRY-er code

* dedupe

* lint fixes
This commit is contained in:
Jaco
2021-12-09 21:17:29 +02:00
committed by GitHub
parent d4a9b43e88
commit 248561ca14
13 changed files with 50 additions and 59 deletions
+14 -10
View File
@@ -49,27 +49,31 @@ function getTypeClassArray (value: TypeDef): string[] {
return getSubDefArray(value).map(getTypeDefType);
}
function createInt ({ displayName, length }: TypeDef, Clazz: typeof Int | typeof UInt): Constructor<Codec> {
function createInt (Clazz: typeof Int | typeof UInt, { displayName, length }: TypeDef): Constructor<Codec> {
assert(isNumber(length), () => `Expected bitLength information for ${displayName || Clazz.constructor.name}<bitLength>`);
return Clazz.with(length as UIntBitLength, displayName);
}
function createHashMap (value: TypeDef, Clazz: typeof BTreeMap | typeof HashMap): Constructor<Codec> {
function createHashMap (Clazz: typeof BTreeMap | typeof HashMap, value: TypeDef): Constructor<Codec> {
const [keyType, valueType] = getTypeClassArray(value);
return Clazz.with(keyType, valueType);
}
function createWithSub (Clazz: { with: (t: string) => Constructor<Codec> }, value: TypeDef): Constructor<Codec> {
return Clazz.with(getSubType(value));
}
const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => Constructor<Codec>> = {
[TypeDefInfo.BTreeMap]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
createHashMap(value, BTreeMap),
createHashMap(BTreeMap, value),
[TypeDefInfo.BTreeSet]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
BTreeSet.with(getSubType(value)),
createWithSub(BTreeSet, value),
[TypeDefInfo.Compact]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
Compact.with(getSubType(value)),
createWithSub(Compact, value),
[TypeDefInfo.DoNotConstruct]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
DoNotConstruct.with(value.displayName || value.type),
@@ -89,10 +93,10 @@ const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => C
},
[TypeDefInfo.HashMap]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
createHashMap(value, HashMap),
createHashMap(HashMap, value),
[TypeDefInfo.Int]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
createInt(value, Int),
createInt(Int, value),
// We have circular deps between Linkage & Struct
[TypeDefInfo.Linkage]: (registry: Registry, value: TypeDef): Constructor<Codec> => {
@@ -114,7 +118,7 @@ const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => C
Null,
[TypeDefInfo.Option]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
Option.with(getSubType(value)),
createWithSub(Option, value),
[TypeDefInfo.Plain]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
registry.getOrUnknown(value.type),
@@ -149,7 +153,7 @@ const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => C
Tuple.with(getTypeClassArray(value)),
[TypeDefInfo.UInt]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
createInt(value, UInt),
createInt(UInt, value),
[TypeDefInfo.Vec]: (registry: Registry, { sub }: TypeDef): Constructor<Codec> => {
assert(sub && !Array.isArray(sub), 'Expected type information for vector');
@@ -172,7 +176,7 @@ const infoMapping: Record<TypeDefInfo, (registry: Registry, value: TypeDef) => C
},
[TypeDefInfo.WrapperOpaque]: (registry: Registry, value: TypeDef): Constructor<Codec> =>
WrapperOpaque.with(getSubType(value))
createWithSub(WrapperOpaque, value)
};
export function constructTypeClass<T extends Codec = Codec> (registry: Registry, typeDef: TypeDef): Constructor<T> {
@@ -1,11 +1,20 @@
// Copyright 2017-2021 @polkadot/types authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { PortableType, Si0Field, Si0LookupTypeId, Si0Path, Si0Type, Si0TypeDefArray, Si0TypeDefBitSequence, Si0TypeDefComposite, Si0TypeDefPrimitive, Si0TypeDefSequence, Si0TypeDefVariant, Si1Field, Si1TypeDef } from '../../interfaces';
import type { PortableType, Si0Field, Si0LookupTypeId, Si0Path, Si0Type, Si0TypeDefArray, Si0TypeDefBitSequence, Si0TypeDefComposite, Si0TypeDefPrimitive, Si0TypeDefSequence, Si0TypeDefVariant, Si1Field, Si1TypeDef, SiTypeDef } from '../../interfaces';
import type { Registry } from '../../types';
import { assertUnreachable } from './util';
function convertType (key: 'Compact' | 'Sequence'): (registry: Registry, si: Si0TypeDefSequence) => SiTypeDef {
return (registry: Registry, { type }: Si0TypeDefSequence) =>
registry.createType('Si1TypeDef', {
[key]: {
type: type.toNumber()
}
});
}
function convertArray (registry: Registry, { len, type }: Si0TypeDefArray): Si1TypeDef {
return registry.createType('Si1TypeDef', {
Array: {
@@ -24,13 +33,7 @@ function convertBitSequence (registry: Registry, { bitOrderType, bitStoreType }:
});
}
function convertCompact (registry: Registry, { type }: Si0TypeDefSequence): Si1TypeDef {
return registry.createType('Si1TypeDef', {
Compact: {
type: type.toNumber()
}
});
}
const convertCompact = convertType('Compact');
function convertComposite (registry: Registry, { fields }: Si0TypeDefComposite): Si1TypeDef {
return registry.createType('Si1TypeDef', {
@@ -65,13 +68,7 @@ function convertPrimitive (registry: Registry, prim: Si0TypeDefPrimitive): Si1Ty
});
}
function convertSequence (registry: Registry, { type }: Si0TypeDefSequence): Si1TypeDef {
return registry.createType('Si1TypeDef', {
Sequence: {
type: type.toNumber()
}
});
}
const convertSequence = convertType('Sequence');
function convertTuple (registry: Registry, types: Si0LookupTypeId[]): Si1TypeDef {
return registry.createType('Si1TypeDef', {