From 921e55a82e14fa8a4ec7229cb96f96c0f2f6b062 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 16 Feb 2020 13:51:37 +0100 Subject: [PATCH] Move types/codec/create -> types/create (#1871) * Move types/codec/create -> types/create * Update imports after move * Cleanups * Cleanup code circular deps * Re-add dropped interfaces * Drop duplicated code * Fix imports * Remove whacky comment --- CHANGELOG.md | 1 + package.json | 3 +- packages/api-contract/src/types.ts | 2 +- packages/api-contract/src/util.ts | 3 +- packages/api/src/checkTypes.manual.ts | 2 +- .../metadata/src/Decorated/Decorated.spec.ts | 2 +- .../Decorated/consts/fromMetadata/index.ts | 2 +- .../fromMetadata/createUnchecked.ts | 4 +- .../storage/fromMetadata/createFunction.ts | 3 +- .../storage/fromMetadata/substrate.ts | 2 +- .../src/Metadata/MetadataVersioned.ts | 2 +- .../metadata/src/Metadata/util/testUtil.ts | 2 +- .../metadata/src/Metadata/util/toCallsOnly.ts | 2 +- .../src/Metadata/util/validateTypes.ts | 5 +- .../metadata/src/Metadata/v0/Metadata.spec.ts | 2 +- packages/metadata/src/Metadata/v0/toV1.ts | 3 +- packages/metadata/src/Metadata/v1/toV2.ts | 2 +- packages/metadata/src/Metadata/v10/toV11.ts | 2 +- .../metadata/src/Metadata/v11/toLatest.ts | 2 +- packages/metadata/src/Metadata/v2/toV3.ts | 2 +- packages/metadata/src/Metadata/v3/toV4.ts | 3 +- packages/metadata/src/Metadata/v4/toV5.ts | 3 +- packages/metadata/src/Metadata/v5/toV6.ts | 2 +- packages/metadata/src/Metadata/v6/toV7.ts | 2 +- packages/metadata/src/Metadata/v7/toV8.ts | 2 +- packages/metadata/src/Metadata/v8/toV9.ts | 2 +- packages/metadata/src/Metadata/v9/toV10.ts | 2 +- packages/rpc-core/src/index.ts | 3 +- packages/types/src/codec/BTreeMap.spec.ts | 2 +- packages/types/src/codec/BTreeSet.spec.ts | 2 +- packages/types/src/codec/Compact.spec.ts | 2 +- packages/types/src/codec/Date.spec.ts | 2 +- packages/types/src/codec/Date.ts | 2 +- packages/types/src/codec/Enum.spec.ts | 2 +- packages/types/src/codec/Int.spec.ts | 2 +- packages/types/src/codec/Option.spec.ts | 2 +- packages/types/src/codec/Raw.spec.ts | 2 +- packages/types/src/codec/Result.spec.ts | 2 +- packages/types/src/codec/Set.spec.ts | 2 +- packages/types/src/codec/Struct.spec.ts | 2 +- packages/types/src/codec/Tuple.spec.ts | 2 +- packages/types/src/codec/U8aFixed.spec.ts | 2 +- packages/types/src/codec/UInt.spec.ts | 2 +- packages/types/src/codec/UInt.ts | 2 +- packages/types/src/codec/Vec.spec.ts | 2 +- packages/types/src/codec/VecFixed.spec.ts | 2 +- .../types/src/codec/create/createClass.ts | 28 ----------- .../src/codec/create/getTypeClass.spec.ts | 17 ------- packages/types/src/codec/index.ts | 1 - packages/types/src/codec/types.ts | 5 -- .../src/codec/utils/compareArray.spec.ts | 2 +- .../types/src/codec/utils/compareMap.spec.ts | 2 +- packages/types/src/codec/utils/encodeTypes.ts | 2 +- .../types/src/codec/utils/mapToTypeMap.ts | 2 +- .../{codec => }/create/createClass.spec.ts | 14 +++++- .../getTypeClass.ts => create/createClass.ts} | 50 +++++++++++++------ .../src/{codec => }/create/createType.spec.ts | 2 +- .../src/{codec => }/create/createType.ts | 4 +- .../src/{codec => }/create/getTypeDef.spec.ts | 2 +- .../src/{codec => }/create/getTypeDef.ts | 0 .../types/src/{codec => }/create/index.ts | 1 - .../src/{codec => }/create/registry.spec.ts | 8 +-- .../types/src/{codec => }/create/registry.ts | 17 +++---- .../types/src/{codec => }/create/sanitize.ts | 0 .../src/{codec => }/create/typeSplit.spec.ts | 0 .../types/src/{codec => }/create/typeSplit.ts | 0 .../types/src/{codec => }/create/types.ts | 4 +- packages/types/src/index.spec.ts | 2 +- packages/types/src/index.ts | 1 + packages/types/src/index.types.ts | 3 -- .../interfaces/identity/Registration.spec.ts | 2 +- .../interfaces/rpc/ChainProperties.spec.ts | 2 +- .../interfaces/rpc/ExtrinsicStatus.spec.ts | 2 +- .../src/interfaces/rpc/KeyValueOption.spec.ts | 2 +- .../src/interfaces/rpc/RuntimeVersion.spec.ts | 2 +- .../interfaces/runtime/EdcsaSignature.spec.ts | 2 +- .../src/interfaces/runtime/Header.spec.ts | 2 +- .../src/interfaces/runtime/KeyValue.spec.ts | 2 +- .../interfaces/runtime/SignedBlock.spec.ts | 2 +- .../src/interfaces/system/EventRecord.spec.ts | 2 +- packages/types/src/primitive/Bool.spec.ts | 2 +- packages/types/src/primitive/Bool.ts | 2 +- packages/types/src/primitive/Bytes.spec.ts | 2 +- packages/types/src/primitive/Data.spec.ts | 2 +- packages/types/src/primitive/Data.ts | 2 +- .../src/primitive/Extrinsic/Extrinsic.spec.ts | 2 +- .../src/primitive/Extrinsic/Extrinsic.ts | 2 +- .../primitive/Extrinsic/ExtrinsicEra.spec.ts | 2 +- .../Extrinsic/ExtrinsicPayload.spec.ts | 2 +- .../primitive/Extrinsic/ExtrinsicPayload.ts | 2 +- .../primitive/Extrinsic/SignerPayload.spec.ts | 4 +- .../src/primitive/Extrinsic/SignerPayload.ts | 2 +- .../src/primitive/Extrinsic/v1/Extrinsic.ts | 2 +- .../Extrinsic/v1/ExtrinsicSignature.ts | 2 +- .../primitive/Extrinsic/v2/Extrinsic.spec.ts | 2 +- .../src/primitive/Extrinsic/v2/Extrinsic.ts | 2 +- .../Extrinsic/v2/ExtrinsicSignature.spec.ts | 2 +- .../Extrinsic/v2/ExtrinsicSignature.ts | 2 +- .../primitive/Extrinsic/v3/Extrinsic.spec.ts | 2 +- .../src/primitive/Extrinsic/v3/Extrinsic.ts | 2 +- .../Extrinsic/v3/ExtrinsicSignature.spec.ts | 2 +- .../Extrinsic/v3/ExtrinsicSignature.ts | 2 +- .../primitive/Extrinsic/v4/Extrinsic.spec.ts | 2 +- .../src/primitive/Extrinsic/v4/Extrinsic.ts | 2 +- .../Extrinsic/v4/ExtrinsicSignature.spec.ts | 2 +- .../Extrinsic/v4/ExtrinsicSignature.ts | 2 +- .../src/primitive/Generic/AccountId.spec.ts | 2 +- .../primitive/Generic/AccountIndex.spec.ts | 2 +- .../src/primitive/Generic/AccountIndex.ts | 2 +- .../src/primitive/Generic/Address.spec.ts | 2 +- .../types/src/primitive/Generic/Address.ts | 2 +- .../types/src/primitive/Generic/Block.spec.ts | 2 +- packages/types/src/primitive/Generic/Block.ts | 2 +- .../types/src/primitive/Generic/Call.spec.ts | 2 +- packages/types/src/primitive/Generic/Call.ts | 2 +- .../primitive/Generic/ConsensusEngineId.ts | 2 +- .../src/primitive/Generic/Digest.spec.ts | 2 +- packages/types/src/primitive/Generic/Event.ts | 2 +- .../src/primitive/Generic/Origin.spec.ts | 2 +- .../types/src/primitive/Generic/Vote.spec.ts | 2 +- packages/types/src/primitive/Generic/Vote.ts | 2 +- .../src/primitive/IdentityFields.spec.ts | 2 +- .../types/src/primitive/IdentityFields.ts | 2 +- packages/types/src/primitive/Null.spec.ts | 2 +- .../types/src/primitive/StorageKey.spec.ts | 2 +- packages/types/src/primitive/Text.spec.ts | 2 +- packages/types/src/primitive/Text.ts | 2 +- packages/types/src/primitive/Type.spec.ts | 2 +- packages/types/src/primitive/Type.ts | 2 +- packages/types/src/scripts/MetadataMd.ts | 3 +- packages/types/src/scripts/generate/consts.ts | 2 +- packages/types/src/scripts/generate/query.ts | 2 +- packages/types/src/scripts/generate/rpc.ts | 2 +- packages/types/src/scripts/generate/tsDef.ts | 4 +- packages/types/src/scripts/generate/tx.ts | 2 +- packages/types/src/scripts/util/derived.ts | 4 +- packages/types/src/scripts/util/formatting.ts | 4 +- packages/types/src/scripts/util/imports.ts | 5 +- packages/types/src/types/codec.ts | 1 + packages/types/src/types/index.ts | 2 +- yarn.lock | 8 +-- 141 files changed, 204 insertions(+), 225 deletions(-) delete mode 100644 packages/types/src/codec/create/createClass.ts delete mode 100644 packages/types/src/codec/create/getTypeClass.spec.ts delete mode 100644 packages/types/src/codec/types.ts rename packages/types/src/{codec => }/create/createClass.spec.ts (64%) rename packages/types/src/{codec/create/getTypeClass.ts => create/createClass.ts} (74%) rename packages/types/src/{codec => }/create/createType.spec.ts (99%) rename packages/types/src/{codec => }/create/createType.ts (97%) rename packages/types/src/{codec => }/create/getTypeDef.spec.ts (99%) rename packages/types/src/{codec => }/create/getTypeDef.ts (100%) rename packages/types/src/{codec => }/create/index.ts (92%) rename packages/types/src/{codec => }/create/registry.spec.ts (95%) rename packages/types/src/{codec => }/create/registry.ts (95%) rename packages/types/src/{codec => }/create/sanitize.ts (100%) rename packages/types/src/{codec => }/create/typeSplit.spec.ts (100%) rename packages/types/src/{codec => }/create/typeSplit.ts (100%) rename packages/types/src/{codec => }/create/types.ts (96%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57d0ff67b0..5d9d35659b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.3.0-beta.x +- The `@polkadot/types/codec/create` has been moved to `@polkadot/types/create`, imports from `@polkadot/types` are unaffected - Expose chain properies on registry (and use for API type formatting) # 1.2.1 Feb 16, 2020 diff --git a/package.json b/package.json index dbebb2b02f..2b65124421 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "scripts": { "build": "yarn build:interfaces && polkadot-dev-build-ts", "build:interfaces": "node packages/types/src/scripts/interfacesTsWrapper.js", - "circular": "madge --circular --extensions ts ./", "docs": "node packages/types/src/scripts/MetadataMdWrapper.js && polkadot-dev-build-docs", "chain:info": "node packages/types/src/scripts/extractChainWrapper.js", "lint": "polkadot-dev-run-lint", @@ -27,7 +26,7 @@ "@babel/core": "^7.8.4", "@babel/register": "^7.8.3", "@babel/runtime": "^7.8.4", - "@polkadot/dev": "^0.40.16", + "@polkadot/dev": "^0.40.17", "@polkadot/ts": "^0.2.3" } } diff --git a/packages/api-contract/src/types.ts b/packages/api-contract/src/types.ts index 429164ca37..12340fdd3e 100644 --- a/packages/api-contract/src/types.ts +++ b/packages/api-contract/src/types.ts @@ -5,7 +5,7 @@ import { ApiTypes, DecorateMethod } from '@polkadot/api/types'; import { AccountId, Address, ContractExecResult } from '@polkadot/types/interfaces'; import { Codec, CodecArg } from '@polkadot/types/types'; -import { MetaRegistryJson, StringIndex, TypeIndex, TypeDef } from '@polkadot/types/codec/create/types'; +import { MetaRegistryJson, StringIndex, TypeIndex, TypeDef } from '@polkadot/types/create/types'; // import { Observable } from 'rxjs'; import { ApiPromise, ApiRx } from '@polkadot/api'; diff --git a/packages/api-contract/src/util.ts b/packages/api-contract/src/util.ts index 503c5440a5..cc59978dc2 100644 --- a/packages/api-contract/src/util.ts +++ b/packages/api-contract/src/util.ts @@ -4,8 +4,7 @@ import { Codec, Registry, TypeDefInfo, TypeDef } from '@polkadot/types/types'; -import { Option, Raw, createClass } from '@polkadot/types'; -import { createTypeUnsafe } from '@polkadot/types/codec'; +import { Option, Raw, createClass, createTypeUnsafe } from '@polkadot/types'; export function formatData (registry: Registry, data: Raw, { info, type }: TypeDef): Codec { if (info === TypeDefInfo.Option) { diff --git a/packages/api/src/checkTypes.manual.ts b/packages/api/src/checkTypes.manual.ts index 082648c758..6ef6ae0eda 100644 --- a/packages/api/src/checkTypes.manual.ts +++ b/packages/api/src/checkTypes.manual.ts @@ -10,7 +10,7 @@ import { IExtrinsic, IMethod } from '@polkadot/types/types'; import { ApiPromise } from '@polkadot/api'; import { HeaderExtended } from '@polkadot/api-derive'; import testKeyring, { TestKeyringMap } from '@polkadot/keyring/testingPairs'; -import { createType, createTypeUnsafe, TypeRegistry } from '@polkadot/types/codec'; +import { createType, createTypeUnsafe, TypeRegistry } from '@polkadot/types'; import { SubmittableResult } from './'; diff --git a/packages/metadata/src/Decorated/Decorated.spec.ts b/packages/metadata/src/Decorated/Decorated.spec.ts index d82ddb5951..cdefdabe47 100644 --- a/packages/metadata/src/Decorated/Decorated.spec.ts +++ b/packages/metadata/src/Decorated/Decorated.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ClassOf, createType, TypeRegistry } from '@polkadot/types/codec/create'; +import { ClassOf, createType, TypeRegistry } from '@polkadot/types/create'; import { u8aToHex } from '@polkadot/util'; import Decorated from './Decorated'; diff --git a/packages/metadata/src/Decorated/consts/fromMetadata/index.ts b/packages/metadata/src/Decorated/consts/fromMetadata/index.ts index ec30618d33..748b0751dd 100644 --- a/packages/metadata/src/Decorated/consts/fromMetadata/index.ts +++ b/packages/metadata/src/Decorated/consts/fromMetadata/index.ts @@ -5,7 +5,7 @@ import { Registry } from '@polkadot/types/types'; import { Constants, ConstantCodec, ModuleConstants } from '../../types'; -import { createTypeUnsafe } from '@polkadot/types/codec'; +import { createTypeUnsafe } from '@polkadot/types/create'; import { stringCamelCase } from '@polkadot/util'; import Metadata from '../../../Metadata'; diff --git a/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts b/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts index 6c3e9f5e85..1db63a90a8 100644 --- a/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts +++ b/packages/metadata/src/Decorated/extrinsics/fromMetadata/createUnchecked.ts @@ -6,8 +6,8 @@ import { Call } from '@polkadot/types/interfaces'; import { AnyJsonObject, CallFunction, Registry, RegistryMetadataCall } from '@polkadot/types/types'; // we do a direct import here to remove all circular dependencies (importing from -// /types, /types/codec or /types/codec/create makes all hell break loose) -import { createType } from '@polkadot/types/codec/create/createType'; +// /types, /types/codec or /types/create makes all hell break loose) +import { createType } from '@polkadot/types/create/createType'; import { assert, stringCamelCase } from '@polkadot/util'; /** @internal */ diff --git a/packages/metadata/src/Decorated/storage/fromMetadata/createFunction.ts b/packages/metadata/src/Decorated/storage/fromMetadata/createFunction.ts index 20b228f08f..b9b947b857 100644 --- a/packages/metadata/src/Decorated/storage/fromMetadata/createFunction.ts +++ b/packages/metadata/src/Decorated/storage/fromMetadata/createFunction.ts @@ -6,7 +6,8 @@ import { StorageEntryMetadataLatest } from '@polkadot/types/interfaces/metadata' import { Codec, Registry } from '@polkadot/types/types'; import BN from 'bn.js'; -import { Compact, Raw, createType, createTypeUnsafe } from '@polkadot/types/codec'; +import { Compact, Raw } from '@polkadot/types/codec'; +import { createType, createTypeUnsafe } from '@polkadot/types/create'; import StorageKey, { StorageEntry } from '@polkadot/types/primitive/StorageKey'; import { assert, compactStripLength, isNull, isUndefined, stringLowerFirst, stringToU8a, u8aConcat } from '@polkadot/util'; import { xxhashAsU8a } from '@polkadot/util-crypto'; diff --git a/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts b/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts index bc1c5c2170..1306b78b62 100644 --- a/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts +++ b/packages/metadata/src/Decorated/storage/fromMetadata/substrate.ts @@ -6,7 +6,7 @@ import { StorageEntryMetadataLatest } from '@polkadot/types/interfaces/metadata' import { Registry } from '@polkadot/types/types'; import { StorageEntry } from '@polkadot/types/primitive/StorageKey'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; import createFunction from './createFunction'; diff --git a/packages/metadata/src/Metadata/MetadataVersioned.ts b/packages/metadata/src/Metadata/MetadataVersioned.ts index 2c2cf1f65c..1f76db7d61 100644 --- a/packages/metadata/src/Metadata/MetadataVersioned.ts +++ b/packages/metadata/src/Metadata/MetadataVersioned.ts @@ -5,7 +5,7 @@ import { MetadataAll, MetadataLatest, MetadataV0, MetadataV1, MetadataV2, MetadataV3, MetadataV4, MetadataV5, MetadataV6, MetadataV7, MetadataV8, MetadataV9, MetadataV10, MetadataV11 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec/create/createType'; +import { createType } from '@polkadot/types/create/createType'; import Struct from '@polkadot/types/codec/Struct'; import { assert } from '@polkadot/util'; diff --git a/packages/metadata/src/Metadata/util/testUtil.ts b/packages/metadata/src/Metadata/util/testUtil.ts index 1dce4953ed..74db0aeb13 100644 --- a/packages/metadata/src/Metadata/util/testUtil.ts +++ b/packages/metadata/src/Metadata/util/testUtil.ts @@ -5,7 +5,7 @@ import { Codec, Registry } from '@polkadot/types/types'; import { MetadataInterface } from '../types'; -import { createTypeUnsafe } from '@polkadot/types/codec/create'; +import { createTypeUnsafe } from '@polkadot/types/create'; import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey'; import getUniqTypes from './getUniqTypes'; diff --git a/packages/metadata/src/Metadata/util/toCallsOnly.ts b/packages/metadata/src/Metadata/util/toCallsOnly.ts index dff7218c87..ac204c3e18 100644 --- a/packages/metadata/src/Metadata/util/toCallsOnly.ts +++ b/packages/metadata/src/Metadata/util/toCallsOnly.ts @@ -5,7 +5,7 @@ import { MetadataLatest } from '@polkadot/types/interfaces/metadata'; import { AnyJsonObject, Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toCallsOnly (registry: Registry, { extrinsic, modules }: MetadataLatest): AnyJsonObject | string { diff --git a/packages/metadata/src/Metadata/util/validateTypes.ts b/packages/metadata/src/Metadata/util/validateTypes.ts index 17352e060c..30010bc991 100644 --- a/packages/metadata/src/Metadata/util/validateTypes.ts +++ b/packages/metadata/src/Metadata/util/validateTypes.ts @@ -2,10 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Registry } from '@polkadot/types/types'; -import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '@polkadot/types/codec/types'; +import { Registry, TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '@polkadot/types/types'; -import { getTypeDef } from '@polkadot/types/codec/create'; +import { getTypeDef } from '@polkadot/types/create'; import flattenUniq from './flattenUniq'; diff --git a/packages/metadata/src/Metadata/v0/Metadata.spec.ts b/packages/metadata/src/Metadata/v0/Metadata.spec.ts index 8d4d7759a2..d29900922f 100644 --- a/packages/metadata/src/Metadata/v0/Metadata.spec.ts +++ b/packages/metadata/src/Metadata/v0/Metadata.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '@polkadot/types/codec'; +import { TypeRegistry } from '@polkadot/types/create'; import Metadata from '../'; import latestSubstrateV0 from './static-substrate.json'; diff --git a/packages/metadata/src/Metadata/v0/toV1.ts b/packages/metadata/src/Metadata/v0/toV1.ts index 476aff29cb..b69116187f 100644 --- a/packages/metadata/src/Metadata/v0/toV1.ts +++ b/packages/metadata/src/Metadata/v0/toV1.ts @@ -8,7 +8,8 @@ import { Registry } from '@polkadot/types/types'; import { stringUpperFirst } from '@polkadot/util'; -import { createType, Option, Vec } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; +import { Option, Vec } from '@polkadot/types/codec'; import { Text } from '@polkadot/types/primitive'; /** @internal */ diff --git a/packages/metadata/src/Metadata/v1/toV2.ts b/packages/metadata/src/Metadata/v1/toV2.ts index 3a006b377d..09b9f6d213 100644 --- a/packages/metadata/src/Metadata/v1/toV2.ts +++ b/packages/metadata/src/Metadata/v1/toV2.ts @@ -5,7 +5,7 @@ import { MetadataV1, MetadataV2 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV2 (registry: Registry, metadataV1: MetadataV1): MetadataV2 { diff --git a/packages/metadata/src/Metadata/v10/toV11.ts b/packages/metadata/src/Metadata/v10/toV11.ts index 29009be709..4b7275ba65 100644 --- a/packages/metadata/src/Metadata/v10/toV11.ts +++ b/packages/metadata/src/Metadata/v10/toV11.ts @@ -5,7 +5,7 @@ import { MetadataV10, MetadataV11 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV11 (registry: Registry, { modules }: MetadataV10): MetadataV11 { diff --git a/packages/metadata/src/Metadata/v11/toLatest.ts b/packages/metadata/src/Metadata/v11/toLatest.ts index 4315a71741..b372616a73 100644 --- a/packages/metadata/src/Metadata/v11/toLatest.ts +++ b/packages/metadata/src/Metadata/v11/toLatest.ts @@ -7,7 +7,7 @@ import { FunctionMetadataV11, FunctionMetadataLatest, MetadataV11, MetadataLates import { Registry } from '@polkadot/types/types'; import { getModuleTypes } from '@polkadot/types/known'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; import { Type } from '@polkadot/types/primitive'; import { stringCamelCase } from '@polkadot/util'; diff --git a/packages/metadata/src/Metadata/v2/toV3.ts b/packages/metadata/src/Metadata/v2/toV3.ts index a26254889f..9ee6cc6c4f 100644 --- a/packages/metadata/src/Metadata/v2/toV3.ts +++ b/packages/metadata/src/Metadata/v2/toV3.ts @@ -5,7 +5,7 @@ import { MetadataV2, MetadataV3 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV3 (registry: Registry, metadataV2: MetadataV2): MetadataV3 { diff --git a/packages/metadata/src/Metadata/v3/toV4.ts b/packages/metadata/src/Metadata/v3/toV4.ts index 795b0317af..9134fb0e18 100644 --- a/packages/metadata/src/Metadata/v3/toV4.ts +++ b/packages/metadata/src/Metadata/v3/toV4.ts @@ -5,7 +5,8 @@ import { MetadataV3, MetadataV4, ModuleMetadataV4, StorageFunctionMetadataV3, StorageFunctionMetadataV4 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType, Option } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; +import { Option } from '@polkadot/types/codec'; /** @internal */ function toV4StorageFunction (registry: Registry, storageFn: StorageFunctionMetadataV3): StorageFunctionMetadataV4 { diff --git a/packages/metadata/src/Metadata/v4/toV5.ts b/packages/metadata/src/Metadata/v4/toV5.ts index 96ca6527b8..cb1654e47b 100644 --- a/packages/metadata/src/Metadata/v4/toV5.ts +++ b/packages/metadata/src/Metadata/v4/toV5.ts @@ -7,7 +7,8 @@ import { Registry } from '@polkadot/types/types'; import { assert } from '@polkadot/util'; -import { createType, Option } from '@polkadot/types/codec'; +import { Option } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; import Text from '@polkadot/types/primitive/Text'; const hasherMap: Map = new Map([ diff --git a/packages/metadata/src/Metadata/v5/toV6.ts b/packages/metadata/src/Metadata/v5/toV6.ts index a1bb9e78df..fefd88f929 100644 --- a/packages/metadata/src/Metadata/v5/toV6.ts +++ b/packages/metadata/src/Metadata/v5/toV6.ts @@ -5,7 +5,7 @@ import { MetadataV5, MetadataV6, ModuleMetadataV6 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV6 (registry: Registry, { modules }: MetadataV5): MetadataV6 { diff --git a/packages/metadata/src/Metadata/v6/toV7.ts b/packages/metadata/src/Metadata/v6/toV7.ts index 346367ab24..f9a105c2cf 100644 --- a/packages/metadata/src/Metadata/v6/toV7.ts +++ b/packages/metadata/src/Metadata/v6/toV7.ts @@ -5,7 +5,7 @@ import { MetadataV6, MetadataV7, ModuleMetadataV7 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV7 (registry: Registry, { modules }: MetadataV6): MetadataV7 { diff --git a/packages/metadata/src/Metadata/v7/toV8.ts b/packages/metadata/src/Metadata/v7/toV8.ts index e4bf7a21ad..888f686f5c 100644 --- a/packages/metadata/src/Metadata/v7/toV8.ts +++ b/packages/metadata/src/Metadata/v7/toV8.ts @@ -5,7 +5,7 @@ import { MetadataV7, MetadataV8, ModuleMetadataV8 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV8 (registry: Registry, { modules }: MetadataV7): MetadataV8 { diff --git a/packages/metadata/src/Metadata/v8/toV9.ts b/packages/metadata/src/Metadata/v8/toV9.ts index cfa84d8d01..36eb72bbf8 100644 --- a/packages/metadata/src/Metadata/v8/toV9.ts +++ b/packages/metadata/src/Metadata/v8/toV9.ts @@ -5,7 +5,7 @@ import { MetadataV8, MetadataV9 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; /** @internal */ export default function toV9 (registry: Registry, { modules }: MetadataV8): MetadataV9 { diff --git a/packages/metadata/src/Metadata/v9/toV10.ts b/packages/metadata/src/Metadata/v9/toV10.ts index c884de6598..1027d55b1e 100644 --- a/packages/metadata/src/Metadata/v9/toV10.ts +++ b/packages/metadata/src/Metadata/v9/toV10.ts @@ -5,7 +5,7 @@ import { MetadataV9, MetadataV10, ModuleMetadataV9, ModuleMetadataV10, StorageEntryMetadataV9, StorageEntryTypeV9, StorageHasherV9, StorageHasherV10 } from '@polkadot/types/interfaces/metadata'; import { Registry } from '@polkadot/types/types'; -import { createType } from '@polkadot/types/codec'; +import { createType } from '@polkadot/types/create'; // migrate a storage hasher type // see https://github.com/paritytech/substrate/pull/4462 diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index 49b94f1709..d4e6648b39 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -13,8 +13,7 @@ import { catchError, map, publishReplay, refCount, switchMap } from 'rxjs/operat import jsonrpc from '@polkadot/jsonrpc'; import jsonrpcMethod from '@polkadot/jsonrpc/create/method'; import jsonrpcParam from '@polkadot/jsonrpc/create/param'; -import { Option, StorageKey, Vec, createClass } from '@polkadot/types'; -import { createTypeUnsafe } from '@polkadot/types/codec'; +import { Option, StorageKey, Vec, createClass, createTypeUnsafe } from '@polkadot/types'; import { assert, isFunction, isNull, isNumber, isUndefined, logger, u8aToU8a } from '@polkadot/util'; import { drr } from './rxjs'; diff --git a/packages/types/src/codec/BTreeMap.spec.ts b/packages/types/src/codec/BTreeMap.spec.ts index 2e0ab7e187..efc588a102 100644 --- a/packages/types/src/codec/BTreeMap.spec.ts +++ b/packages/types/src/codec/BTreeMap.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; import Struct from './Struct'; diff --git a/packages/types/src/codec/BTreeSet.spec.ts b/packages/types/src/codec/BTreeSet.spec.ts index 12f17a656a..59d2ad31a8 100644 --- a/packages/types/src/codec/BTreeSet.spec.ts +++ b/packages/types/src/codec/BTreeSet.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; import Struct from './Struct'; diff --git a/packages/types/src/codec/Compact.spec.ts b/packages/types/src/codec/Compact.spec.ts index a53b71de62..407060ff80 100644 --- a/packages/types/src/codec/Compact.spec.ts +++ b/packages/types/src/codec/Compact.spec.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; -import { createType, ClassOf, TypeRegistry } from './create'; +import { createType, ClassOf, TypeRegistry } from '../create'; import Moment from './Date'; import U32 from '../primitive/U32'; import Compact from './Compact'; diff --git a/packages/types/src/codec/Date.spec.ts b/packages/types/src/codec/Date.spec.ts index ce7375bd54..39ae36fdee 100644 --- a/packages/types/src/codec/Date.spec.ts +++ b/packages/types/src/codec/Date.spec.ts @@ -6,7 +6,7 @@ import { CodecTo } from '../types'; import BN from 'bn.js'; -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import U64 from '../primitive/U64'; import CodecDate from './Date'; diff --git a/packages/types/src/codec/Date.ts b/packages/types/src/codec/Date.ts index 77401243e7..01ef206eb4 100644 --- a/packages/types/src/codec/Date.ts +++ b/packages/types/src/codec/Date.ts @@ -8,7 +8,7 @@ import BN from 'bn.js'; import { bnToBn, bnToHex, bnToU8a, isString, isU8a, u8aToBn } from '@polkadot/util'; import { blake2AsU8a } from '@polkadot/util-crypto'; -import { createType } from './create'; +import { createType } from '../create'; import { UIntBitLength } from './AbstractInt'; const BITLENGTH: UIntBitLength = 64; diff --git a/packages/types/src/codec/Enum.spec.ts b/packages/types/src/codec/Enum.spec.ts index 2c23aa44fa..e9a206b249 100644 --- a/packages/types/src/codec/Enum.spec.ts +++ b/packages/types/src/codec/Enum.spec.ts @@ -6,7 +6,7 @@ import { Registry } from '../types'; import { u8aToHex } from '@polkadot/util'; -import { TypeRegistry, createType } from './create'; +import { TypeRegistry, createType } from '../create'; import Null from '../primitive/Null'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; diff --git a/packages/types/src/codec/Int.spec.ts b/packages/types/src/codec/Int.spec.ts index f6033564d7..5d94860325 100644 --- a/packages/types/src/codec/Int.spec.ts +++ b/packages/types/src/codec/Int.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import Int from './Int'; describe('Int', (): void => { diff --git a/packages/types/src/codec/Option.spec.ts b/packages/types/src/codec/Option.spec.ts index d10c158eee..741f34ec51 100644 --- a/packages/types/src/codec/Option.spec.ts +++ b/packages/types/src/codec/Option.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import Bytes from '../primitive/Bytes'; import U32 from '../primitive/U32'; import Text from '../primitive/Text'; diff --git a/packages/types/src/codec/Raw.spec.ts b/packages/types/src/codec/Raw.spec.ts index a8f7ac8a24..265ba2606b 100644 --- a/packages/types/src/codec/Raw.spec.ts +++ b/packages/types/src/codec/Raw.spec.ts @@ -4,7 +4,7 @@ import { CodecTo } from '../types'; -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import Raw from './Raw'; const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Result.spec.ts b/packages/types/src/codec/Result.spec.ts index ba679f711e..4894bbb386 100644 --- a/packages/types/src/codec/Result.spec.ts +++ b/packages/types/src/codec/Result.spec.ts @@ -5,7 +5,7 @@ import { hexToString } from '@polkadot/util'; import { u32, Text } from '../primitive'; -import { createType, TypeRegistry } from './create'; +import { createType, TypeRegistry } from '../create'; import Result from './Result'; describe('Result', (): void => { diff --git a/packages/types/src/codec/Set.spec.ts b/packages/types/src/codec/Set.spec.ts index a87c817f8c..aa5080f424 100644 --- a/packages/types/src/codec/Set.spec.ts +++ b/packages/types/src/codec/Set.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import Set from './Set'; const SET_FIELDS = { diff --git a/packages/types/src/codec/Struct.spec.ts b/packages/types/src/codec/Struct.spec.ts index 27b2c77e62..9444e8174d 100644 --- a/packages/types/src/codec/Struct.spec.ts +++ b/packages/types/src/codec/Struct.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ClassOf, TypeRegistry } from './create'; +import { ClassOf, TypeRegistry } from '../create'; import AccountId from '../primitive/Generic/AccountId'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; diff --git a/packages/types/src/codec/Tuple.spec.ts b/packages/types/src/codec/Tuple.spec.ts index ca82a9af53..aaf08493ce 100644 --- a/packages/types/src/codec/Tuple.spec.ts +++ b/packages/types/src/codec/Tuple.spec.ts @@ -9,7 +9,7 @@ import { CodecTo } from '../types'; import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; -import { ClassOf, TypeRegistry } from './create'; +import { ClassOf, TypeRegistry } from '../create'; import Text from '../primitive/Text'; import U32 from '../primitive/U32'; import U128 from '../primitive/U128'; diff --git a/packages/types/src/codec/U8aFixed.spec.ts b/packages/types/src/codec/U8aFixed.spec.ts index 61200e93bd..ae710e275c 100644 --- a/packages/types/src/codec/U8aFixed.spec.ts +++ b/packages/types/src/codec/U8aFixed.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import U8aFixed from './U8aFixed'; describe('U8aFixed', (): void => { diff --git a/packages/types/src/codec/UInt.spec.ts b/packages/types/src/codec/UInt.spec.ts index 37f13640c6..36ee01587b 100644 --- a/packages/types/src/codec/UInt.spec.ts +++ b/packages/types/src/codec/UInt.spec.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; -import { TypeRegistry } from './create'; +import { TypeRegistry } from '../create'; import UInt from './UInt'; describe('UInt', (): void => { diff --git a/packages/types/src/codec/UInt.ts b/packages/types/src/codec/UInt.ts index 2571e4943e..414b8a4974 100644 --- a/packages/types/src/codec/UInt.ts +++ b/packages/types/src/codec/UInt.ts @@ -6,7 +6,7 @@ import { AnyNumber, Constructor, Registry } from '../types'; import { bnToHex, bnToU8a } from '@polkadot/util'; -import { ClassOf } from './create/createClass'; +import { ClassOf } from '../create/createClass'; import AbstractInt, { DEFAULT_UINT_BITS, UIntBitLength } from './AbstractInt'; /** diff --git a/packages/types/src/codec/Vec.spec.ts b/packages/types/src/codec/Vec.spec.ts index 1c7ebbcf07..eda11a5c1f 100644 --- a/packages/types/src/codec/Vec.spec.ts +++ b/packages/types/src/codec/Vec.spec.ts @@ -8,9 +8,9 @@ import { Codec, CodecTo } from '../types'; import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; +import { createTypeUnsafe, TypeRegistry } from '../create'; import AccountId from '../primitive/Generic/AccountId'; import Text from '../primitive/Text'; -import { createTypeUnsafe, TypeRegistry } from './create'; import Vec from './Vec'; import Tuple from './Tuple'; diff --git a/packages/types/src/codec/VecFixed.spec.ts b/packages/types/src/codec/VecFixed.spec.ts index 68f0335fdf..23c3df4b61 100644 --- a/packages/types/src/codec/VecFixed.spec.ts +++ b/packages/types/src/codec/VecFixed.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Text from '../primitive/Text'; import VecFixed from './VecFixed'; diff --git a/packages/types/src/codec/create/createClass.ts b/packages/types/src/codec/create/createClass.ts deleted file mode 100644 index 44519a1436..0000000000 --- a/packages/types/src/codec/create/createClass.ts +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017-2020 @polkadot/types authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -import { Codec, Constructor, InterfaceTypes, Registry } from '../../types'; -import { FromReg } from './types'; - -import { InterfaceRegistry } from '../../interfaceRegistry'; -import { getTypeClass } from './getTypeClass'; -import { getTypeDef } from './getTypeDef'; - -export function createClass (registry: Registry, type: K): Constructor> { - return getTypeClass>(registry, getTypeDef(type)); -} - -// An unsafe version of the `createType` below. It's unsafe because the `type` -// argument here can be any string, which, if it cannot be parsed, it will yield -// a runtime error. -export function ClassOfUnsafe (registry: Registry, name: K): Constructor> { - return createClass(registry, name); -} - -// alias for createClass -export function ClassOf (registry: Registry, name: K): Constructor { - // TS2589: Type instantiation is excessively deep and possibly infinite. - // The above happens with as Constructor; - return ClassOfUnsafe(registry, name) as any; -} diff --git a/packages/types/src/codec/create/getTypeClass.spec.ts b/packages/types/src/codec/create/getTypeClass.spec.ts deleted file mode 100644 index 6367087c9a..0000000000 --- a/packages/types/src/codec/create/getTypeClass.spec.ts +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2017-2020 @polkadot/types authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -import { Codec, Constructor } from '../../types'; - -import { getTypeClass, TypeRegistry } from '.'; - -describe('getTypeClass', (): void => { - const registry = new TypeRegistry(); - - it('does not allow invalid types', (): void => { - expect( - (): Constructor => getTypeClass(registry, 'SomethingInvalid' as any) - ).toThrow(/determine type/); - }); -}); diff --git a/packages/types/src/codec/index.ts b/packages/types/src/codec/index.ts index c214197f6c..c856630e88 100644 --- a/packages/types/src/codec/index.ts +++ b/packages/types/src/codec/index.ts @@ -26,5 +26,4 @@ export { default as Raw } from './Raw'; export { default as UInt } from './UInt'; // Type management helper functions -export * from './create'; export * from './utils/encodeTypes'; diff --git a/packages/types/src/codec/types.ts b/packages/types/src/codec/types.ts deleted file mode 100644 index deb8dbd57e..0000000000 --- a/packages/types/src/codec/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2017-2020 @polkadot/types authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -export * from './create/types'; diff --git a/packages/types/src/codec/utils/compareArray.spec.ts b/packages/types/src/codec/utils/compareArray.spec.ts index 796ed2099b..c7199c27e9 100644 --- a/packages/types/src/codec/utils/compareArray.spec.ts +++ b/packages/types/src/codec/utils/compareArray.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../create'; +import { TypeRegistry } from '../../create'; import U32 from '../../primitive/U32'; import compareArray from './compareArray'; diff --git a/packages/types/src/codec/utils/compareMap.spec.ts b/packages/types/src/codec/utils/compareMap.spec.ts index 54a6896a8e..eb93050a29 100644 --- a/packages/types/src/codec/utils/compareMap.spec.ts +++ b/packages/types/src/codec/utils/compareMap.spec.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { Codec } from '../../types'; -import { TypeRegistry } from '../create'; +import { TypeRegistry } from '../../create'; import U32 from '../../primitive/U32'; import compareMap from './compareMap'; diff --git a/packages/types/src/codec/utils/encodeTypes.ts b/packages/types/src/codec/utils/encodeTypes.ts index 617652f1d1..6f0c7e35be 100644 --- a/packages/types/src/codec/utils/encodeTypes.ts +++ b/packages/types/src/codec/utils/encodeTypes.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../types'; +import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../../create/types'; import { assert } from '@polkadot/util'; diff --git a/packages/types/src/codec/utils/mapToTypeMap.ts b/packages/types/src/codec/utils/mapToTypeMap.ts index ccf2477c03..4df91de53e 100644 --- a/packages/types/src/codec/utils/mapToTypeMap.ts +++ b/packages/types/src/codec/utils/mapToTypeMap.ts @@ -6,7 +6,7 @@ import { Codec, Constructor, InterfaceTypes, Registry } from '../../types'; import { isString } from '@polkadot/util'; -import { ClassOf } from '../create/createClass'; +import { ClassOf } from '../../create/createClass'; export function typeToConstructor (registry: Registry, type: InterfaceTypes | Constructor): Constructor { return ( diff --git a/packages/types/src/codec/create/createClass.spec.ts b/packages/types/src/create/createClass.spec.ts similarity index 64% rename from packages/types/src/codec/create/createClass.spec.ts rename to packages/types/src/create/createClass.spec.ts index f9d34c96ce..5783953e97 100644 --- a/packages/types/src/codec/create/createClass.spec.ts +++ b/packages/types/src/create/createClass.spec.ts @@ -2,7 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createClass, TypeRegistry } from '.'; +import { Codec, Constructor } from '../types'; + +import { createClass, getTypeClass, TypeRegistry } from '.'; describe('createClass', (): void => { const registry = new TypeRegistry(); @@ -21,3 +23,13 @@ describe('createClass', (): void => { expect(new A(registry) instanceof B).toBe(true); }); }); + +describe('getTypeClass', (): void => { + const registry = new TypeRegistry(); + + it('does not allow invalid types', (): void => { + expect( + (): Constructor => getTypeClass(registry, 'SomethingInvalid' as any) + ).toThrow(/determine type/); + }); +}); diff --git a/packages/types/src/codec/create/getTypeClass.ts b/packages/types/src/create/createClass.ts similarity index 74% rename from packages/types/src/codec/create/getTypeClass.ts rename to packages/types/src/create/createClass.ts index e45f89d7ea..494c15df35 100644 --- a/packages/types/src/codec/create/getTypeClass.ts +++ b/packages/types/src/create/createClass.ts @@ -2,24 +2,44 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Codec, Constructor, InterfaceTypes, Registry } from '../../types'; -import { TypeDef, TypeDefExtVecFixed, TypeDefInfo } from './types'; +import { Codec, Constructor, InterfaceTypes, Registry } from '../types'; +import { FromReg, TypeDef, TypeDefExtVecFixed, TypeDefInfo } from './types'; import { assert } from '@polkadot/util'; -import BTreeMap from '../BTreeMap'; -import BTreeSet from '../BTreeSet'; -import Compact from '../Compact'; -import Enum from '../Enum'; -import Option from '../Option'; -import Result from '../Result'; -import CodecSet from '../Set'; -import Struct from '../Struct'; -import Tuple from '../Tuple'; -import U8aFixed, { BitLength as U8aFixedBitLength } from '../U8aFixed'; -import Vec from '../Vec'; -import VecFixed from '../VecFixed'; -import { ClassOf } from './createClass'; +import BTreeMap from '../codec/BTreeMap'; +import BTreeSet from '../codec/BTreeSet'; +import Compact from '../codec/Compact'; +import Enum from '../codec/Enum'; +import Option from '../codec/Option'; +import Result from '../codec/Result'; +import CodecSet from '../codec/Set'; +import Struct from '../codec/Struct'; +import Tuple from '../codec/Tuple'; +import U8aFixed, { BitLength as U8aFixedBitLength } from '../codec/U8aFixed'; +import Vec from '../codec/Vec'; +import VecFixed from '../codec/VecFixed'; +import { InterfaceRegistry } from '../interfaceRegistry'; +import { getTypeDef } from './getTypeDef'; + +export function createClass (registry: Registry, type: K): Constructor> { + // eslint-disable-next-line @typescript-eslint/no-use-before-define + return getTypeClass>(registry, getTypeDef(type)); +} + +// An unsafe version of the `createType` below. It's unsafe because the `type` +// argument here can be any string, which, if it cannot be parsed, it will yield +// a runtime error. +export function ClassOfUnsafe (registry: Registry, name: K): Constructor> { + return createClass(registry, name); +} + +// alias for createClass +export function ClassOf (registry: Registry, name: K): Constructor { + // TS2589: Type instantiation is excessively deep and possibly infinite. + // The above happens with as Constructor; + return ClassOfUnsafe(registry, name) as any; +} function getSubDefArray (value: TypeDef): TypeDef[] { assert(value.sub && Array.isArray(value.sub), `Expected subtype as TypeDef[] in ${JSON.stringify(value)}`); diff --git a/packages/types/src/codec/create/createType.spec.ts b/packages/types/src/create/createType.spec.ts similarity index 99% rename from packages/types/src/codec/create/createType.spec.ts rename to packages/types/src/create/createType.spec.ts index 1f6ec879c2..61056d3418 100644 --- a/packages/types/src/codec/create/createType.spec.ts +++ b/packages/types/src/create/createType.spec.ts @@ -2,8 +2,8 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import CodecSet from '../codec/Set'; import { createClass, createType, createTypeUnsafe, ClassOf, TypeRegistry } from '.'; -import CodecSet from '../Set'; describe('createType', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/create/createType.ts b/packages/types/src/create/createType.ts similarity index 97% rename from packages/types/src/codec/create/createType.ts rename to packages/types/src/create/createType.ts index 3d4123e0e5..6d036998cc 100644 --- a/packages/types/src/codec/create/createType.ts +++ b/packages/types/src/create/createType.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Codec, Constructor, InterfaceTypes, Registry } from '../../types'; +import { Codec, Constructor, InterfaceTypes, Registry } from '../types'; import { FromReg } from './types'; import { isU8a, u8aToHex } from '@polkadot/util'; -import { InterfaceRegistry } from '../../interfaceRegistry'; +import { InterfaceRegistry } from '../interfaceRegistry'; import { createClass } from './createClass'; function u8aHasValue (value: Uint8Array): boolean { diff --git a/packages/types/src/codec/create/getTypeDef.spec.ts b/packages/types/src/create/getTypeDef.spec.ts similarity index 99% rename from packages/types/src/codec/create/getTypeDef.spec.ts rename to packages/types/src/create/getTypeDef.spec.ts index 240da6be3f..cb07c5e988 100644 --- a/packages/types/src/codec/create/getTypeDef.spec.ts +++ b/packages/types/src/create/getTypeDef.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef, TypeDefInfo } from '../types'; +import { TypeDef, TypeDefInfo } from './types'; import { getTypeDef } from '.'; diff --git a/packages/types/src/codec/create/getTypeDef.ts b/packages/types/src/create/getTypeDef.ts similarity index 100% rename from packages/types/src/codec/create/getTypeDef.ts rename to packages/types/src/create/getTypeDef.ts diff --git a/packages/types/src/codec/create/index.ts b/packages/types/src/create/index.ts similarity index 92% rename from packages/types/src/codec/create/index.ts rename to packages/types/src/create/index.ts index 92d13307fa..082a3b48af 100644 --- a/packages/types/src/codec/create/index.ts +++ b/packages/types/src/create/index.ts @@ -6,7 +6,6 @@ import { createType } from './createType'; export * from './createClass'; export * from './createType'; -export * from './getTypeClass'; export * from './getTypeDef'; export * from './registry'; export * from './typeSplit'; diff --git a/packages/types/src/codec/create/registry.spec.ts b/packages/types/src/create/registry.spec.ts similarity index 95% rename from packages/types/src/codec/create/registry.spec.ts rename to packages/types/src/create/registry.spec.ts index 545ecd5bac..046d68467e 100644 --- a/packages/types/src/codec/create/registry.spec.ts +++ b/packages/types/src/create/registry.spec.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Constructor } from '../../types'; +import { Constructor } from '../types'; +import Struct from '../codec/Struct'; +import Text from '../primitive/Text'; +import U32 from '../primitive/U32'; import { TypeRegistry } from './registry'; -import Struct from '../Struct'; -import Text from '../../primitive/Text'; -import U32 from '../../primitive/U32'; // Copied from interfacesTs function isChildClass (Parent: Constructor, Child?: Constructor): boolean { diff --git a/packages/types/src/codec/create/registry.ts b/packages/types/src/create/registry.ts similarity index 95% rename from packages/types/src/codec/create/registry.ts rename to packages/types/src/create/registry.ts index fcc5d52fcc..1765ae0ac2 100644 --- a/packages/types/src/codec/create/registry.ts +++ b/packages/types/src/create/registry.ts @@ -3,17 +3,16 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ChainProperties, DispatchErrorModule } from '../../interfaces/types'; -import { CallFunction, Codec, Constructor, InterfaceTypes, RegistryError, RegistryTypes, Registry, RegistryMetadata, TypeDef } from '../../types'; +import { ChainProperties, DispatchErrorModule } from '../interfaces/types'; +import { CallFunction, Codec, Constructor, InterfaceTypes, RegistryError, RegistryTypes, Registry, RegistryMetadata, TypeDef } from '../types'; import extrinsicsFromMeta from '@polkadot/metadata/Decorated/extrinsics/fromMetadata'; import { assert, isFunction, isString, isU8a, isUndefined, stringCamelCase, u8aToHex } from '@polkadot/util'; -import Raw from '../Raw'; -import { EventData } from '../../primitive/Generic/Event'; -import { defaultExtensions, expandExtensionTypes, findUnknownExtensions } from '../../primitive/Extrinsic/signedExtensions'; -import { createClass } from './createClass'; -import { getTypeClass } from './getTypeClass'; +import Raw from '../codec/Raw'; +import { EventData } from '../primitive/Generic/Event'; +import { defaultExtensions, expandExtensionTypes, findUnknownExtensions } from '../primitive/Extrinsic/signedExtensions'; +import { createClass, getTypeClass } from './createClass'; import { getTypeDef } from './getTypeDef'; // create error mapping from metadata @@ -95,8 +94,8 @@ export class TypeRegistry implements Registry { // we only want to import these on creation, i.e. we want to avoid types // weird side-effects from circular references. (Since registry is injected // into types, this can be a real concern now) - const baseTypes: RegistryTypes = require('../../index.types'); - const definitions: Record = require('../../interfaces/definitions'); + const baseTypes: RegistryTypes = require('../index.types'); + const definitions: Record = require('../interfaces/definitions'); // since these are classes, they are injected first this.register({ Raw, ...baseTypes }); diff --git a/packages/types/src/codec/create/sanitize.ts b/packages/types/src/create/sanitize.ts similarity index 100% rename from packages/types/src/codec/create/sanitize.ts rename to packages/types/src/create/sanitize.ts diff --git a/packages/types/src/codec/create/typeSplit.spec.ts b/packages/types/src/create/typeSplit.spec.ts similarity index 100% rename from packages/types/src/codec/create/typeSplit.spec.ts rename to packages/types/src/create/typeSplit.spec.ts diff --git a/packages/types/src/codec/create/typeSplit.ts b/packages/types/src/create/typeSplit.ts similarity index 100% rename from packages/types/src/codec/create/typeSplit.ts rename to packages/types/src/create/typeSplit.ts diff --git a/packages/types/src/codec/create/types.ts b/packages/types/src/create/types.ts similarity index 96% rename from packages/types/src/codec/create/types.ts rename to packages/types/src/create/types.ts index cb02cc3187..8d9c417141 100644 --- a/packages/types/src/codec/create/types.ts +++ b/packages/types/src/create/types.ts @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Codec, InterfaceTypes } from '../../types'; +import { Codec, InterfaceTypes } from '../types'; -import { InterfaceRegistry } from '../../interfaceRegistry'; +import { InterfaceRegistry } from '../interfaceRegistry'; // Type which says: if `K` is in the InterfaceRegistry, then return InterfaceRegistry[K], else fallback to T export type FromReg = K extends InterfaceTypes diff --git a/packages/types/src/index.spec.ts b/packages/types/src/index.spec.ts index c6d19f333e..889c996484 100644 --- a/packages/types/src/index.spec.ts +++ b/packages/types/src/index.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { createTypeUnsafe, TypeRegistry } from './codec/create'; +import { createTypeUnsafe, TypeRegistry } from './create'; import { Codec } from './types'; import * as exported from './index.types'; import * as definitions from './interfaces/definitions'; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index b3227ad853..32d6c2f832 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -13,6 +13,7 @@ try { } export * from './codec'; +export * from './create'; export * from './index.types'; // FIXME We actually don't want to do this (if needed, it certainly is not in the right place) diff --git a/packages/types/src/index.types.ts b/packages/types/src/index.types.ts index e8889d6415..b1a2aedd2a 100644 --- a/packages/types/src/index.types.ts +++ b/packages/types/src/index.types.ts @@ -2,8 +2,5 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -/** - * @summary Type definitions that are used in the system - */ export { default as Metadata } from '@polkadot/metadata/Metadata'; export * from './primitive'; diff --git a/packages/types/src/interfaces/identity/Registration.spec.ts b/packages/types/src/interfaces/identity/Registration.spec.ts index 71868a8757..d70e0c7585 100644 --- a/packages/types/src/interfaces/identity/Registration.spec.ts +++ b/packages/types/src/interfaces/identity/Registration.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry, createType } from '../../codec/create'; +import { TypeRegistry, createType } from '../../create'; const registry = new TypeRegistry(); diff --git a/packages/types/src/interfaces/rpc/ChainProperties.spec.ts b/packages/types/src/interfaces/rpc/ChainProperties.spec.ts index 9187f9e6e8..7b5ee65dca 100644 --- a/packages/types/src/interfaces/rpc/ChainProperties.spec.ts +++ b/packages/types/src/interfaces/rpc/ChainProperties.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; describe('ChainProperties', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts b/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts index ded6a9b07a..e334db2979 100644 --- a/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts +++ b/packages/types/src/interfaces/rpc/ExtrinsicStatus.spec.ts @@ -4,7 +4,7 @@ import { ExtrinsicStatus } from './types'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import rpc from '../../json/ExtrinsicStatus.001.json'; describe('ExtrinsicStatus', (): void => { diff --git a/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts b/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts index e069e78db8..82d78f57b5 100644 --- a/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts +++ b/packages/types/src/interfaces/rpc/KeyValueOption.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; describe('KeyValueOption', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts b/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts index 53f3108879..45e0f9df73 100644 --- a/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts +++ b/packages/types/src/interfaces/rpc/RuntimeVersion.spec.ts @@ -4,7 +4,7 @@ import { RuntimeVersion } from './types'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import rpc from '../../json/RuntimeVersion.002.json'; describe('RuntimeVersion', (): void => { diff --git a/packages/types/src/interfaces/runtime/EdcsaSignature.spec.ts b/packages/types/src/interfaces/runtime/EdcsaSignature.spec.ts index 3f4c85655d..249fa87ea1 100644 --- a/packages/types/src/interfaces/runtime/EdcsaSignature.spec.ts +++ b/packages/types/src/interfaces/runtime/EdcsaSignature.spec.ts @@ -4,7 +4,7 @@ import { hexToU8a } from '@polkadot/util'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; const TESTS = [ '0x55bd020bdbbdc02de34e915effc9b18a99002f4c29f64e22e8dcbb69e722ea6c28e1bb53b9484063fbbfd205e49dcc1f620929f520c9c4c3695150f05a28f52a01', diff --git a/packages/types/src/interfaces/runtime/Header.spec.ts b/packages/types/src/interfaces/runtime/Header.spec.ts index e04c106baf..507cbf647b 100644 --- a/packages/types/src/interfaces/runtime/Header.spec.ts +++ b/packages/types/src/interfaces/runtime/Header.spec.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import json1 from '../../json/Header.001.json'; import json2 from '../../json/Header.002.json'; import json3 from '../../json/Header.003.json'; diff --git a/packages/types/src/interfaces/runtime/KeyValue.spec.ts b/packages/types/src/interfaces/runtime/KeyValue.spec.ts index 7aee059c98..67e25f2be4 100644 --- a/packages/types/src/interfaces/runtime/KeyValue.spec.ts +++ b/packages/types/src/interfaces/runtime/KeyValue.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; describe('KeyValue', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/interfaces/runtime/SignedBlock.spec.ts b/packages/types/src/interfaces/runtime/SignedBlock.spec.ts index f053a88d43..1b497f2cc1 100644 --- a/packages/types/src/interfaces/runtime/SignedBlock.spec.ts +++ b/packages/types/src/interfaces/runtime/SignedBlock.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import events from '../../json/SignedBlock.002.json'; import immortalTxs from '../../json/SignedBlock.004.immortal.json'; import mortalTxs from '../../json/SignedBlock.004.mortal.json'; diff --git a/packages/types/src/interfaces/system/EventRecord.spec.ts b/packages/types/src/interfaces/system/EventRecord.spec.ts index c12902d31c..26a1300350 100644 --- a/packages/types/src/interfaces/system/EventRecord.spec.ts +++ b/packages/types/src/interfaces/system/EventRecord.spec.ts @@ -6,7 +6,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadataV0 from '@polkadot/metadata/Metadata/v0/static'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import json1 from '../../json/EventRecord.001.json'; import json3 from '../../json/EventRecord.003.json'; diff --git a/packages/types/src/primitive/Bool.spec.ts b/packages/types/src/primitive/Bool.spec.ts index e65c524ebd..8718c7329c 100644 --- a/packages/types/src/primitive/Bool.spec.ts +++ b/packages/types/src/primitive/Bool.spec.ts @@ -4,7 +4,7 @@ import { CodecTo } from '../types'; -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Bool from './Bool'; describe('Bool', (): void => { diff --git a/packages/types/src/primitive/Bool.ts b/packages/types/src/primitive/Bool.ts index 1f2b3b9150..dd48f19a2c 100644 --- a/packages/types/src/primitive/Bool.ts +++ b/packages/types/src/primitive/Bool.ts @@ -7,7 +7,7 @@ import { Codec, IHash, Registry } from '../types'; import { isU8a, u8aToHex } from '@polkadot/util'; import { blake2AsU8a } from '@polkadot/util-crypto'; -import { createType } from '../codec/create'; +import { createType } from '../create'; /** @internal */ function decodeBool (value: any): boolean { diff --git a/packages/types/src/primitive/Bytes.spec.ts b/packages/types/src/primitive/Bytes.spec.ts index 4581c6c9b1..f0fb115e8e 100644 --- a/packages/types/src/primitive/Bytes.spec.ts +++ b/packages/types/src/primitive/Bytes.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../codec/create'; +import { createType, TypeRegistry } from '../create'; import Bytes from './Bytes'; describe('Bytes', (): void => { diff --git a/packages/types/src/primitive/Data.spec.ts b/packages/types/src/primitive/Data.spec.ts index e8d3cdba17..f20e438143 100644 --- a/packages/types/src/primitive/Data.spec.ts +++ b/packages/types/src/primitive/Data.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec/create'; +import { TypeRegistry } from '../create'; import Data from './Data'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Data.ts b/packages/types/src/primitive/Data.ts index eb5bb8249a..5fe0883db8 100644 --- a/packages/types/src/primitive/Data.ts +++ b/packages/types/src/primitive/Data.ts @@ -7,7 +7,7 @@ import { Registry } from '../types'; import { isString, isU8a, u8aToU8a } from '@polkadot/util'; import Enum from '../codec/Enum'; -import { createType } from '../codec/create/createType'; +import { createType } from '../create/createType'; import Bytes from './Bytes'; import H256 from './H256'; diff --git a/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts b/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts index 5465baac8d..b686bb99b1 100644 --- a/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts +++ b/packages/types/src/primitive/Extrinsic/Extrinsic.spec.ts @@ -6,7 +6,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import { hexToU8a } from '@polkadot/util'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/Extrinsic.ts index c9501599a1..df50591834 100644 --- a/packages/types/src/primitive/Extrinsic/Extrinsic.ts +++ b/packages/types/src/primitive/Extrinsic/Extrinsic.ts @@ -8,7 +8,7 @@ import { AnyU8a, ArgsDef, Codec, ExtrinsicPayloadValue, IExtrinsic, IKeyringPair import { assert, isHex, isU8a, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../codec/create'; +import { createType, ClassOf } from '../../create'; import Base from '../../codec/Base'; import Compact from '../../codec/Compact'; import { ExtrinsicValueV1 } from './v1/Extrinsic'; diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts b/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts index d61a2edf2d..b622073069 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts +++ b/packages/types/src/primitive/Extrinsic/ExtrinsicEra.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import ExtrinsicEra from './ExtrinsicEra'; describe('ExtrinsicEra', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts index adaf5c4578..72a7436445 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts +++ b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.spec.ts @@ -4,7 +4,7 @@ import { u8aToHex } from '@polkadot/util'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import ExtrinsicPayload from './ExtrinsicPayload'; describe('ExtrinsicPayload', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts index 0f8cee9bb4..7c18db6eb5 100644 --- a/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts +++ b/packages/types/src/primitive/Extrinsic/ExtrinsicPayload.ts @@ -7,7 +7,7 @@ import { BareOpts, ExtrinsicPayloadValue, IKeyringPair, InterfaceTypes, Registry import { u8aToHex } from '@polkadot/util'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import Base from '../../codec/Base'; import Compact from '../../codec/Compact'; import Raw from '../../codec/Raw'; diff --git a/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts b/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts index 0d05d49229..d8b42dc70f 100644 --- a/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts +++ b/packages/types/src/primitive/Extrinsic/SignerPayload.spec.ts @@ -2,12 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType } from '@polkadot/types'; - import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../codec'; +import { createType, TypeRegistry } from '../../create'; import SignerPayload from './SignerPayload'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/SignerPayload.ts b/packages/types/src/primitive/Extrinsic/SignerPayload.ts index b64606b6b9..cc14b253ef 100644 --- a/packages/types/src/primitive/Extrinsic/SignerPayload.ts +++ b/packages/types/src/primitive/Extrinsic/SignerPayload.ts @@ -6,7 +6,7 @@ import { u8aToHex } from '@polkadot/util'; import { Address, Balance, BlockNumber, Call, ExtrinsicEra, Hash, Index, RuntimeVersion } from '../../interfaces'; import Compact from '../../codec/Compact'; import Struct from '../../codec/Struct'; -import { createType } from '../../codec'; +import { createType } from '../../create'; import { Codec, Constructor, ISignerPayload, SignerPayloadJSON, SignerPayloadRaw } from '../../types'; import u8 from '../U8'; diff --git a/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts index fe612a7b22..f6f3a7ac58 100644 --- a/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts +++ b/packages/types/src/primitive/Extrinsic/v1/Extrinsic.ts @@ -8,7 +8,7 @@ import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType } from '../../../codec/create'; +import { createType } from '../../../create'; import Struct from '../../../codec/Struct'; export interface ExtrinsicValueV1 { diff --git a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts index 32eac24d80..d3e6718dd2 100644 --- a/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts +++ b/packages/types/src/primitive/Extrinsic/v1/ExtrinsicSignature.ts @@ -6,7 +6,7 @@ import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../.. import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../../types'; import { ExtrinsicSignatureOptions } from '../types'; -import { createType } from '../../../codec/create'; +import { createType } from '../../../create'; import Compact from '../../../codec/Compact'; import Struct from '../../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; diff --git a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts b/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts index 6b67bf1369..21333787fa 100644 --- a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v2/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import testingPairs from '@polkadot/keyring/testingPairs'; -import { TypeRegistry } from '../../../codec'; +import { TypeRegistry } from '../../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts index 801b2ce669..b6d77917b0 100644 --- a/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts +++ b/packages/types/src/primitive/Extrinsic/v2/Extrinsic.ts @@ -8,7 +8,7 @@ import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../codec/create'; +import { createType, ClassOf } from '../../../create'; import Struct from '../../../codec/Struct'; const TRANSACTION_VERSION = 2; diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts index 19448e3a46..2535115dab 100644 --- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../codec'; +import { TypeRegistry } from '../../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV2', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts index ba398252a7..1d868aa088 100644 --- a/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts +++ b/packages/types/src/primitive/Extrinsic/v2/ExtrinsicSignature.ts @@ -6,7 +6,7 @@ import { Address, Balance, Call, ExtrinsicEra, Index, Signature } from '../../.. import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, Registry, SignatureOptions } from '../../../types'; import { ExtrinsicSignatureOptions } from '../types'; -import { createType } from '../../../codec/create'; +import { createType } from '../../../create'; import Compact from '../../../codec/Compact'; import Struct from '../../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; diff --git a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts b/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts index 4626097c29..e38d2c80e0 100644 --- a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v3/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import rpcMetadata from '@polkadot/metadata/Metadata/static'; import testingPairs from '@polkadot/keyring/testingPairs'; -import { TypeRegistry } from '../../../codec'; +import { TypeRegistry } from '../../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts index 00253c2e9d..5494bc52f3 100644 --- a/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts +++ b/packages/types/src/primitive/Extrinsic/v3/Extrinsic.ts @@ -8,7 +8,7 @@ import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../codec/create'; +import { createType, ClassOf } from '../../../create'; import Struct from '../../../codec/Struct'; const TRANSACTION_VERSION = 3; diff --git a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts b/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts index 04fe153c2f..9483ed903a 100644 --- a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../codec'; +import { TypeRegistry } from '../../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV3', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts index 539856a978..98db320350 100644 --- a/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts +++ b/packages/types/src/primitive/Extrinsic/v3/ExtrinsicSignature.ts @@ -5,7 +5,7 @@ import { Address, Call } from '../../../interfaces/runtime'; import { ExtrinsicPayloadValue, IExtrinsicSignature, IKeyringPair, SignatureOptions } from '../../../types'; -import { createType } from '../../../codec/create'; +import { createType } from '../../../create'; import { IMMORTAL_ERA } from '../constants'; import ExtrinsicSignatureV2 from '../v2/ExtrinsicSignature'; import ExtrinsicPayloadV3 from './ExtrinsicPayload'; diff --git a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts b/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts index 76e3519441..80278dc3af 100644 --- a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v4/Extrinsic.spec.ts @@ -8,7 +8,7 @@ import Decorated from '@polkadot/metadata/Decorated'; import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../../codec/create'; +import { TypeRegistry } from '../../../create'; import Extrinsic from './Extrinsic'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts b/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts index 41464d4eab..b50a95386d 100644 --- a/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts +++ b/packages/types/src/primitive/Extrinsic/v4/Extrinsic.ts @@ -8,7 +8,7 @@ import { ExtrinsicOptions } from '../types'; import { isU8a } from '@polkadot/util'; -import { createType, ClassOf } from '../../../codec/create'; +import { createType, ClassOf } from '../../../create'; import Struct from '../../../codec/Struct'; export const TRANSACTION_VERSION = 4; diff --git a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts b/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts index 94470102d8..abeb7284a8 100644 --- a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts +++ b/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../../codec'; +import { TypeRegistry } from '../../../create'; import ExtrinsicSignature from './ExtrinsicSignature'; describe('ExtrinsicSignatureV4', (): void => { diff --git a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts b/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts index 363d0d39a2..3180d0689b 100644 --- a/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts +++ b/packages/types/src/primitive/Extrinsic/v4/ExtrinsicSignature.ts @@ -8,7 +8,7 @@ import { ExtrinsicSignatureOptions } from '../types'; import { u8aConcat } from '@polkadot/util'; -import { createType } from '../../../codec/create'; +import { createType } from '../../../create'; import Compact from '../../../codec/Compact'; import Struct from '../../../codec/Struct'; import { EMPTY_U8A, IMMORTAL_ERA } from '../constants'; diff --git a/packages/types/src/primitive/Generic/AccountId.spec.ts b/packages/types/src/primitive/Generic/AccountId.spec.ts index da4ccf4c8c..7b5f6f8d42 100644 --- a/packages/types/src/primitive/Generic/AccountId.spec.ts +++ b/packages/types/src/primitive/Generic/AccountId.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import Raw from '../../codec/Raw'; import jsonVec from '../../json/AccountIdVec.001.json'; import AccountId from './AccountId'; diff --git a/packages/types/src/primitive/Generic/AccountIndex.spec.ts b/packages/types/src/primitive/Generic/AccountIndex.spec.ts index 07eea11e29..25640d0824 100644 --- a/packages/types/src/primitive/Generic/AccountIndex.spec.ts +++ b/packages/types/src/primitive/Generic/AccountIndex.spec.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import AccountIndex from './AccountIndex'; describe('AccountIndex', (): void => { diff --git a/packages/types/src/primitive/Generic/AccountIndex.ts b/packages/types/src/primitive/Generic/AccountIndex.ts index 911268c585..728bd5d49a 100644 --- a/packages/types/src/primitive/Generic/AccountIndex.ts +++ b/packages/types/src/primitive/Generic/AccountIndex.ts @@ -8,7 +8,7 @@ import BN from 'bn.js'; import { bnToBn, isBn, isNumber, isU8a, isHex } from '@polkadot/util'; import { decodeAddress, encodeAddress } from '@polkadot/util-crypto'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import U32 from '../U32'; export const ENUMSET_SIZE = new BN(64); diff --git a/packages/types/src/primitive/Generic/Address.spec.ts b/packages/types/src/primitive/Generic/Address.spec.ts index e601cf7475..7c70314bf0 100644 --- a/packages/types/src/primitive/Generic/Address.spec.ts +++ b/packages/types/src/primitive/Generic/Address.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { createType, TypeRegistry } from '../../codec/create'; +import { createType, TypeRegistry } from '../../create'; import AccountId from './AccountId'; import AccountIndex from './AccountIndex'; import Address from './Address'; diff --git a/packages/types/src/primitive/Generic/Address.ts b/packages/types/src/primitive/Generic/Address.ts index 9ad8bee4d4..954d1c79fd 100644 --- a/packages/types/src/primitive/Generic/Address.ts +++ b/packages/types/src/primitive/Generic/Address.ts @@ -8,7 +8,7 @@ import BN from 'bn.js'; import { isBn, isHex, isNumber, isU8a, u8aConcat, u8aToHex, u8aToU8a, u8aToBn } from '@polkadot/util'; import { decodeAddress } from '@polkadot/util-crypto'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import Base from '../../codec/Base'; import AccountId from './AccountId'; import AccountIndex from './AccountIndex'; diff --git a/packages/types/src/primitive/Generic/Block.spec.ts b/packages/types/src/primitive/Generic/Block.spec.ts index 6c86de96c5..c9f9c5c178 100644 --- a/packages/types/src/primitive/Generic/Block.spec.ts +++ b/packages/types/src/primitive/Generic/Block.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import block00300 from '../../json/SignedBlock.003.00.json'; import Block from './Block'; diff --git a/packages/types/src/primitive/Generic/Block.ts b/packages/types/src/primitive/Generic/Block.ts index ad1c1f57c8..94dad34791 100644 --- a/packages/types/src/primitive/Generic/Block.ts +++ b/packages/types/src/primitive/Generic/Block.ts @@ -7,7 +7,7 @@ import { AnyNumber, AnyU8a, Registry } from '../../types'; import { blake2AsU8a } from '@polkadot/util-crypto'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import Extrinsic from '../Extrinsic/Extrinsic'; import Struct from '../../codec/Struct'; import Vec from '../../codec/Vec'; diff --git a/packages/types/src/primitive/Generic/Call.spec.ts b/packages/types/src/primitive/Generic/Call.spec.ts index e6b29f5941..c0545ee415 100644 --- a/packages/types/src/primitive/Generic/Call.spec.ts +++ b/packages/types/src/primitive/Generic/Call.spec.ts @@ -5,7 +5,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import metadataStatic from '@polkadot/metadata/Metadata/static'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import Call from './Call'; const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Generic/Call.ts b/packages/types/src/primitive/Generic/Call.ts index 743211f97c..f36e982d7a 100644 --- a/packages/types/src/primitive/Generic/Call.ts +++ b/packages/types/src/primitive/Generic/Call.ts @@ -7,7 +7,7 @@ import { AnyU8a, ArgsDef, Codec, IMethod, Registry } from '../../types'; import { isHex, isObject, isU8a, u8aToU8a } from '@polkadot/util'; -import { getTypeDef, getTypeClass } from '../../codec/create'; +import { getTypeDef, getTypeClass } from '../../create'; import Struct from '../../codec/Struct'; import U8aFixed from '../../codec/U8aFixed'; diff --git a/packages/types/src/primitive/Generic/ConsensusEngineId.ts b/packages/types/src/primitive/Generic/ConsensusEngineId.ts index 9f3ebf9ec3..23002852cf 100644 --- a/packages/types/src/primitive/Generic/ConsensusEngineId.ts +++ b/packages/types/src/primitive/Generic/ConsensusEngineId.ts @@ -7,7 +7,7 @@ import { AccountId } from '../../interfaces/runtime'; import BN from 'bn.js'; import { bnToBn } from '@polkadot/util'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import Bytes from '../Bytes'; import U32 from '../U32'; diff --git a/packages/types/src/primitive/Generic/Digest.spec.ts b/packages/types/src/primitive/Generic/Digest.spec.ts index 64510a422f..ce3e152ded 100644 --- a/packages/types/src/primitive/Generic/Digest.spec.ts +++ b/packages/types/src/primitive/Generic/Digest.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import json3 from '../../json/Header.003.json'; import block1 from '../../json/SignedBlock.003.00.json'; import Digest from './Digest'; diff --git a/packages/types/src/primitive/Generic/Event.ts b/packages/types/src/primitive/Generic/Event.ts index 62608b9b9b..9177cf9190 100644 --- a/packages/types/src/primitive/Generic/Event.ts +++ b/packages/types/src/primitive/Generic/Event.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef } from '../../codec/types'; +import { TypeDef } from '../../create/types'; import { EventMetadataLatest } from '../../interfaces/metadata'; import { EventId } from '../../interfaces/system'; import { Constructor, Registry, RegistryMetadataEvent } from '../../types'; diff --git a/packages/types/src/primitive/Generic/Origin.spec.ts b/packages/types/src/primitive/Generic/Origin.spec.ts index 6cb600c257..9be2074f3b 100644 --- a/packages/types/src/primitive/Generic/Origin.spec.ts +++ b/packages/types/src/primitive/Generic/Origin.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import Origin from './Origin'; describe('Origin', (): void => { diff --git a/packages/types/src/primitive/Generic/Vote.spec.ts b/packages/types/src/primitive/Generic/Vote.spec.ts index c04cd558be..60691568c2 100644 --- a/packages/types/src/primitive/Generic/Vote.spec.ts +++ b/packages/types/src/primitive/Generic/Vote.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import Vote from './Vote'; describe('Vote', (): void => { diff --git a/packages/types/src/primitive/Generic/Vote.ts b/packages/types/src/primitive/Generic/Vote.ts index 98c1fd0248..7cc6819c72 100644 --- a/packages/types/src/primitive/Generic/Vote.ts +++ b/packages/types/src/primitive/Generic/Vote.ts @@ -8,7 +8,7 @@ import { Conviction } from '../../interfaces/democracy'; import { isBoolean, isNumber, isU8a, isUndefined } from '@polkadot/util'; -import { createType } from '../../codec/create'; +import { createType } from '../../create'; import U8aFixed from '../../codec/U8aFixed'; import Bool from '../Bool'; diff --git a/packages/types/src/primitive/IdentityFields.spec.ts b/packages/types/src/primitive/IdentityFields.spec.ts index ebd568c5d6..fa8dfc6f8f 100644 --- a/packages/types/src/primitive/IdentityFields.spec.ts +++ b/packages/types/src/primitive/IdentityFields.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import IdentityFields from './IdentityFields'; describe('IdentityFields', (): void => { diff --git a/packages/types/src/primitive/IdentityFields.ts b/packages/types/src/primitive/IdentityFields.ts index 450c5d3d31..4206a595b0 100644 --- a/packages/types/src/primitive/IdentityFields.ts +++ b/packages/types/src/primitive/IdentityFields.ts @@ -8,7 +8,7 @@ import BN from 'bn.js'; import { isString, isU8a, u8aToU8a } from '@polkadot/util'; import Set from '../codec/Set'; -import { createType } from '../codec/create/createType'; +import { createType } from '../create/createType'; /** @internal */ function decodeFields (registry: Registry, value?: any): any { diff --git a/packages/types/src/primitive/Null.spec.ts b/packages/types/src/primitive/Null.spec.ts index 7b3714ab0e..200dfef97c 100644 --- a/packages/types/src/primitive/Null.spec.ts +++ b/packages/types/src/primitive/Null.spec.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Null from './Null'; describe('Null', (): void => { diff --git a/packages/types/src/primitive/StorageKey.spec.ts b/packages/types/src/primitive/StorageKey.spec.ts index e77c12ab04..5688a61395 100644 --- a/packages/types/src/primitive/StorageKey.spec.ts +++ b/packages/types/src/primitive/StorageKey.spec.ts @@ -11,7 +11,7 @@ import rpcDataV7 from '@polkadot/metadata/Metadata/v7/static'; import rpcDataV8 from '@polkadot/metadata/Metadata/v8/static'; import { hexToU8a } from '@polkadot/util'; -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import StorageKey from './StorageKey'; describe('StorageKey', (): void => { diff --git a/packages/types/src/primitive/Text.spec.ts b/packages/types/src/primitive/Text.spec.ts index 95d9c8a96f..fb6ae7ff46 100644 --- a/packages/types/src/primitive/Text.spec.ts +++ b/packages/types/src/primitive/Text.spec.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { CodecTo } from '../types'; -import { TypeRegistry } from '../codec/create'; +import { TypeRegistry } from '../create'; import Raw from '../codec/Raw'; import Text from './Text'; diff --git a/packages/types/src/primitive/Text.ts b/packages/types/src/primitive/Text.ts index 53001c77da..5cd8d61ffc 100644 --- a/packages/types/src/primitive/Text.ts +++ b/packages/types/src/primitive/Text.ts @@ -7,7 +7,7 @@ import { AnyU8a, Codec, IHash, Registry } from '../types'; import { assert, hexToU8a, isHex, isString, stringToU8a, u8aToString, u8aToHex } from '@polkadot/util'; import { blake2AsU8a } from '@polkadot/util-crypto'; -import { createType } from '../codec/create'; +import { createType } from '../create'; import Compact from '../codec/Compact'; import Raw from '../codec/Raw'; diff --git a/packages/types/src/primitive/Type.spec.ts b/packages/types/src/primitive/Type.spec.ts index 0c37da4900..adb440151e 100644 --- a/packages/types/src/primitive/Type.spec.ts +++ b/packages/types/src/primitive/Type.spec.ts @@ -4,7 +4,7 @@ import { stringToU8a, u8aConcat } from '@polkadot/util'; -import { TypeRegistry } from '../codec'; +import { TypeRegistry } from '../create'; import Text from './Text'; import Type from './Type'; diff --git a/packages/types/src/primitive/Type.ts b/packages/types/src/primitive/Type.ts index 53b178f27a..d650bc98dd 100644 --- a/packages/types/src/primitive/Type.ts +++ b/packages/types/src/primitive/Type.ts @@ -4,7 +4,7 @@ import { Registry } from '../types'; -import sanitize from '../codec/create/sanitize'; +import sanitize from '../create/sanitize'; import Text from './Text'; /** diff --git a/packages/types/src/scripts/MetadataMd.ts b/packages/types/src/scripts/MetadataMd.ts index 152e9ee8e0..100a57db7a 100644 --- a/packages/types/src/scripts/MetadataMd.ts +++ b/packages/types/src/scripts/MetadataMd.ts @@ -12,7 +12,8 @@ import { stringCamelCase, stringLowerFirst } from '@polkadot/util'; import interfaces from '../../../type-jsonrpc/src'; import { unwrapStorageType } from '../primitive/StorageKey'; import Call from '../primitive/Generic/Call'; -import { TypeRegistry, Vec } from '../codec'; +import { TypeRegistry } from '../create'; +import { Vec } from '../codec'; import { Text } from '../primitive'; const STATIC_TEXT = '\n\n(NOTE: These were generated from a static/snapshot view of a recent Substrate master node. Some items may not be available in older nodes, or in any customized implementations.)'; diff --git a/packages/types/src/scripts/generate/consts.ts b/packages/types/src/scripts/generate/consts.ts index 83d23337a7..81ce6a963a 100644 --- a/packages/types/src/scripts/generate/consts.ts +++ b/packages/types/src/scripts/generate/consts.ts @@ -9,7 +9,7 @@ import staticData from '@polkadot/metadata/Metadata/static'; import Metadata from '@polkadot/metadata/Metadata'; import { stringCamelCase } from '@polkadot/util'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import { FOOTER, HEADER, TypeImports, createDocComments, createImportCode, createImports, indent, setImports, writeFile } from '../util'; // Generate types for one module diff --git a/packages/types/src/scripts/generate/query.ts b/packages/types/src/scripts/generate/query.ts index 8c36289b6b..f3bf6ae8fa 100644 --- a/packages/types/src/scripts/generate/query.ts +++ b/packages/types/src/scripts/generate/query.ts @@ -10,7 +10,7 @@ import staticData from '@polkadot/metadata/Metadata/static'; import Metadata from '@polkadot/metadata/Metadata'; import { stringLowerFirst } from '@polkadot/util'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import { FOOTER, HEADER, TypeImports, createDocComments, createImportCode, createImports, formatType, getSimilarTypes, indent, setImports, writeFile } from '../util'; // If the StorageEntry returns T, output `Option` if the modifier is optional diff --git a/packages/types/src/scripts/generate/rpc.ts b/packages/types/src/scripts/generate/rpc.ts index 25d1ed7cad..b26f9327d5 100644 --- a/packages/types/src/scripts/generate/rpc.ts +++ b/packages/types/src/scripts/generate/rpc.ts @@ -4,7 +4,7 @@ import interfaces from '../../../../type-jsonrpc/src'; import * as definitions from '../../interfaces/definitions'; -import { TypeRegistry } from '../../codec/create'; +import { TypeRegistry } from '../../create'; import { FOOTER, HEADER, createDocComments, createImportCode, createImports, getSimilarTypes, setImports, writeFile, indent } from '../util'; /** @internal */ diff --git a/packages/types/src/scripts/generate/tsDef.ts b/packages/types/src/scripts/generate/tsDef.ts index 6a1dbe1491..778900cb35 100644 --- a/packages/types/src/scripts/generate/tsDef.ts +++ b/packages/types/src/scripts/generate/tsDef.ts @@ -2,13 +2,13 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../../codec/types'; +import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../../create/types'; import fs from 'fs'; import path from 'path'; import { isString, stringCamelCase, stringUpperFirst } from '@polkadot/util'; -import { getTypeDef } from '../../codec/create'; +import { getTypeDef } from '../../create'; import * as defaultDefinitions from '../../interfaces/definitions'; import { FOOTER, HEADER, TypeImports, createImportCode, createImports, exportInterface, exportType, formatType, setImports, writeFile } from '../util'; diff --git a/packages/types/src/scripts/generate/tx.ts b/packages/types/src/scripts/generate/tx.ts index 6b7a5d65c0..c5b8325167 100644 --- a/packages/types/src/scripts/generate/tx.ts +++ b/packages/types/src/scripts/generate/tx.ts @@ -11,7 +11,7 @@ import Metadata from '@polkadot/metadata/Metadata'; import { Text } from '@polkadot/types'; import { stringCamelCase } from '@polkadot/util'; -import { TypeRegistry } from '../../codec'; +import { TypeRegistry } from '../../create'; import { FOOTER, HEADER, TypeImports, createDocComments, createImportCode, createImports, formatType, getSimilarTypes, indent, setImports, writeFile } from '../util'; const MAPPED_NAMES: Record = { diff --git a/packages/types/src/scripts/util/derived.ts b/packages/types/src/scripts/util/derived.ts index 81299c3ce1..4e056591eb 100644 --- a/packages/types/src/scripts/util/derived.ts +++ b/packages/types/src/scripts/util/derived.ts @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef, TypeDefInfo } from '../../codec/types'; +import { TypeDef, TypeDefInfo } from '../../create/types'; import { Constructor, Registry } from '../../types'; import { stringLowerFirst } from '@polkadot/util'; import { isChildClass, isCompactEncodable } from './class'; -import { ClassOf, ClassOfUnsafe, getTypeDef } from '../../codec/create'; +import { ClassOf, ClassOfUnsafe, getTypeDef } from '../../create'; import AbstractInt from '../../codec/AbstractInt'; import Compact from '../../codec/Compact'; import Enum from '../../codec/Enum'; diff --git a/packages/types/src/scripts/util/formatting.ts b/packages/types/src/scripts/util/formatting.ts index 925baac556..b20f06f034 100644 --- a/packages/types/src/scripts/util/formatting.ts +++ b/packages/types/src/scripts/util/formatting.ts @@ -2,9 +2,9 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../../codec/types'; +import { TypeDef, TypeDefInfo, TypeDefExtVecFixed } from '../../create/types'; -import { getTypeDef } from '../../codec/create'; +import { getTypeDef } from '../../create'; import { paramsNotation } from '../../codec/utils'; import { setImports, TypeImports } from './imports'; diff --git a/packages/types/src/scripts/util/imports.ts b/packages/types/src/scripts/util/imports.ts index 1163d54ad7..d4c57e247f 100644 --- a/packages/types/src/scripts/util/imports.ts +++ b/packages/types/src/scripts/util/imports.ts @@ -2,9 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { TypeDefInfo } from '../../create/types'; + import * as codecClasses from '../../codec'; -import { getTypeDef } from '../../codec/create'; -import { TypeDefInfo } from '../../codec/types'; +import { getTypeDef } from '../../create'; import * as primitiveClasses from '../../primitive'; // these map all the codec and primitive types for import, see the TypeImports below. If diff --git a/packages/types/src/types/codec.ts b/packages/types/src/types/codec.ts index 049bd2e9b9..734b88f1e5 100644 --- a/packages/types/src/types/codec.ts +++ b/packages/types/src/types/codec.ts @@ -1,6 +1,7 @@ // Copyright 2017-2020 @polkadot/types authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +/* eslint-disable @typescript-eslint/interface-name-prefix */ import { AnyJson, BareOpts } from './helpers'; import { IHash } from './interfaces'; diff --git a/packages/types/src/types/index.ts b/packages/types/src/types/index.ts index 5d638ed666..12e3098283 100644 --- a/packages/types/src/types/index.ts +++ b/packages/types/src/types/index.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export * from '../codec/types'; +export * from '../create/types'; export * from './calls'; export * from './codec'; export * from './extrinsic'; diff --git a/yarn.lock b/yarn.lock index b9612a7b67..ae590c90ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2016,10 +2016,10 @@ dependencies: "@types/node" ">= 8" -"@polkadot/dev@^0.40.16": - version "0.40.16" - resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.40.16.tgz#45dc5ec8f791e38bed0fb4f9d8fde2a0854e488a" - integrity sha512-/vlk7E8TwnmAlLfwNE/7ePMuqSgapPcheWxnH7L+6hXNWKaAVAphjNEDq89D4DpHECxuL9pQvlwGTFM1r8/qkw== +"@polkadot/dev@^0.40.17": + version "0.40.17" + resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.40.17.tgz#493f4a7263797e416b12e6b735b39d428f6c0ef1" + integrity sha512-tAfUlcdOzixa6c4/5fxaXjO4cEmXpGZzx3EAIyqsQw+74FBFVR1BKEeGoGuWetTQfIWKqAMOKsFjF5O6VS+VfA== dependencies: "@babel/cli" "^7.8.4" "@babel/core" "^7.8.4"