diff --git a/packages/types/src/codec/Struct.spec.ts b/packages/types/src/codec/Struct.spec.ts index 5557307be3..0a38efdae5 100644 --- a/packages/types/src/codec/Struct.spec.ts +++ b/packages/types/src/codec/Struct.spec.ts @@ -154,7 +154,7 @@ describe('Struct', (): void => { ).toEqual({ foo: 'Text', bar: 'Text', - baz: 'U32' + baz: 'u32' }); }); diff --git a/packages/types/src/codec/Struct.ts b/packages/types/src/codec/Struct.ts index 5141fc972b..cfa8737bb5 100644 --- a/packages/types/src/codec/Struct.ts +++ b/packages/types/src/codec/Struct.ts @@ -158,7 +158,7 @@ export default class Struct< return (Object .entries(this._Types) as [keyof S, Constructor][]) .reduce((result: E, [key, Type]): E => { - (result as any)[key] = Type.name; + (result as any)[key] = new Type().toRawType(); return result; }, {} as unknown as E); diff --git a/packages/types/src/codec/Tuple.spec.ts b/packages/types/src/codec/Tuple.spec.ts index 7fecaec01a..3cc0d5b0a2 100644 --- a/packages/types/src/codec/Tuple.spec.ts +++ b/packages/types/src/codec/Tuple.spec.ts @@ -79,7 +79,7 @@ describe('Tuple', (): void => { }); it('exposes the Types', (): void => { - expect(tuple.Types).toEqual(['Text', 'U32']); + expect(tuple.Types).toEqual(['Text', 'u32']); }); it('exposes the Types (object creation)', (): void => { diff --git a/packages/types/src/codec/Tuple.ts b/packages/types/src/codec/Tuple.ts index e0fe45ca5d..6c93aefa2b 100644 --- a/packages/types/src/codec/Tuple.ts +++ b/packages/types/src/codec/Tuple.ts @@ -80,7 +80,7 @@ export default class Tuple extends AbstractArray { */ public get Types (): string[] { return Array.isArray(this._Types) - ? this._Types.map(({ name }): string => name) + ? this._Types.map((Type): string => new Type().toRawType()) : Object.keys(this._Types); }