From f11feb4363dfc18a650fccfc478203c797983b0c Mon Sep 17 00:00:00 2001 From: Jaco Date: Fri, 17 Dec 2021 08:45:46 +0100 Subject: [PATCH] Move test files to correct packages (#4345) * Move test files to correct packages * Adjust --- jest.config.cjs | 2 +- packages/api-contract-support/LICENSE | 201 ------------------ packages/api-contract-support/README.md | 3 - packages/api-contract-support/package.json | 28 --- .../api-contract-support/src/detectPackage.ts | 8 - packages/api-contract-support/src/index.ts | 6 - .../api-contract-support/src/packageInfo.ts | 6 - packages/api-contract-support/tsconfig.json | 11 - packages/api-contract/package.json | 3 - packages/api-contract/src/Abi/Abi.spec.ts | 4 +- .../api-contract/src/Abi/toLatest.spec.ts | 4 +- packages/api-contract/src/base/Code.spec.ts | 8 +- .../api-contract/src/checkTypes.manual.ts | 4 +- .../test}/compare/ink_v0_delegator.test.json | 0 .../src/test}/compare/ink_v0_dns.test.json | 0 .../src/test}/compare/ink_v0_erc20.test.json | 0 .../src/test}/compare/ink_v0_erc721.test.json | 0 .../test}/compare/ink_v0_flipper.test.json | 0 .../compare/ink_v0_flipperBundle.test.json | 0 .../compare/ink_v0_incrementer.test.json | 0 .../compare/ink_v0_multisigPlain.test.json | 0 .../test}/compare/ink_v1_flipper.test.json | 0 .../src/test}/compare/ink_v2_erc20.test.json | 0 .../test}/compare/ink_v2_flipper.test.json | 0 .../test}/compare/solang_v0_ints256.test.json | 0 .../compare/user_v0_assetTransfer.test.json | 0 .../compare/user_v0_enumExample.test.json | 0 .../test}/compare/user_v0_recursive.test.json | 0 .../compare/user_v0_withString.test.json | 0 .../src/test}/contracts/index.ts | 0 .../src/test}/contracts/ink/index.ts | 0 .../test}/contracts/ink/v0/accumulator.wasm | Bin .../src/test}/contracts/ink/v0/adder.wasm | Bin .../src/test}/contracts/ink/v0/delegator.json | 0 .../src/test}/contracts/ink/v0/delegator.wasm | Bin .../src/test}/contracts/ink/v0/dns.json | 0 .../src/test}/contracts/ink/v0/dns.wasm | Bin .../src/test}/contracts/ink/v0/erc20.json | 0 .../src/test}/contracts/ink/v0/erc20.wasm | Bin .../src/test}/contracts/ink/v0/erc721.json | 0 .../src/test}/contracts/ink/v0/erc721.wasm | Bin .../contracts/ink/v0/flipper.contract.json | 0 .../src/test}/contracts/ink/v0/flipper.json | 0 .../src/test}/contracts/ink/v0/flipper.wasm | Bin .../test}/contracts/ink/v0/incrementer.json | 0 .../test}/contracts/ink/v0/incrementer.wasm | Bin .../src/test}/contracts/ink/v0/index.ts | 0 .../contracts/ink/v0/multisig_plain.json | 0 .../contracts/ink/v0/multisig_plain.wasm | Bin .../src/test}/contracts/ink/v0/subber.wasm | Bin .../test}/contracts/ink/v0/trait-flipper.json | 0 .../test}/contracts/ink/v0/trait-flipper.wasm | Bin .../contracts/ink/v1/flipper.contract.json | 0 .../src/test}/contracts/ink/v1/index.ts | 0 .../contracts/ink/v2/erc20.contract.json | 0 .../contracts/ink/v2/flipper.contract.json | 0 .../src/test}/contracts/ink/v2/index.ts | 0 .../src/test}/contracts/solang/index.ts | 0 .../src/test}/contracts/solang/v0/index.ts | 0 .../test}/contracts/solang/v0/ints256.json | 0 .../src/test}/contracts/solang/v0/ints256.sol | 0 .../test}/contracts/solang/v0/ints256.wasm | Bin .../src/test}/contracts/user/index.ts | 0 .../contracts/user/v0/assetTransfer.json | 0 .../contracts/user/v0/assetTransfer.wasm | Bin .../test}/contracts/user/v0/enumExample.json | 0 .../test}/contracts/user/v0/enumExample.wasm | Bin .../src/test}/contracts/user/v0/index.ts | 0 .../contracts/user/v0/recursive.contract.json | 0 .../test}/contracts/user/v0/withString.json | 0 .../src/test}/contracts/util.ts | 0 packages/api-contract/tsconfig.json | 12 +- packages/api-contract/tsconfig.spec.json | 24 +++ packages/types-codec/package.json | 3 + .../src/base}/Compact.spec.ts | 7 +- .../src/base}/DoNotConstruct.spec.ts | 4 +- .../src/base}/Enum.spec.ts | 6 +- .../src/base}/Int.spec.ts | 4 +- .../src/base}/Null.spec.ts | 4 +- .../src/base}/Option.spec.ts | 5 +- .../src/base}/Result.spec.ts | 6 +- .../src/base}/Tuple.spec.ts | 10 +- .../src/base}/UInt.spec.ts | 5 +- .../src/base}/Vec.spec.ts | 12 +- .../src/base}/VecFixed.spec.ts | 5 +- .../src/extended}/BTreeMap.spec.ts | 11 +- .../src/extended}/BTreeSet.spec.ts | 11 +- .../src/extended}/BitVec.spec.ts | 2 +- .../src/extended}/Bytes.spec.ts | 4 +- .../src/extended}/HashMap.spec.ts | 5 +- .../src/extended}/Linkage.spec.ts | 4 +- .../src/extended}/Map.spec.ts | 5 +- .../src/extended}/Range.spec.ts | 5 +- .../src/extended}/Type.spec.ts | 5 +- .../src/extended}/U8aFixed.spec.ts | 4 +- .../src/extended}/WrapperOpaque.spec.ts | 4 +- .../src/native}/Bool.spec.ts | 4 +- .../src/native}/Date.spec.ts | 6 +- .../src/native}/Raw.spec.ts | 4 +- .../src/native}/Set.spec.ts | 4 +- .../src/native}/Struct.data.ts | 0 .../src/native}/Struct.spec.ts | 6 +- .../src/native}/Text.spec.ts | 6 +- .../types-codec/src/utils/sanitize.spec.ts | 2 +- packages/types-codec/tsconfig.json | 4 + packages/types-codec/tsconfig.spec.json | 20 ++ .../src/util}/encodeTypes.spec.ts | 6 +- .../src/util}/getTypeDef.spec.ts | 5 +- .../src/util}/typeSplit.spec.ts | 2 +- packages/types-create/tsconfig.json | 3 + packages/types-create/tsconfig.spec.json | 19 ++ packages/types/src/create/createClass.ts | 11 + packages/types/src/create/createType.ts | 17 ++ packages/types/src/create/index.ts | 21 +- packages/types/src/create/registry.spec.ts | 3 +- tsconfig.base.json | 1 - tsconfig.json | 4 +- yarn.lock | 12 +- 118 files changed, 200 insertions(+), 415 deletions(-) delete mode 100644 packages/api-contract-support/LICENSE delete mode 100644 packages/api-contract-support/README.md delete mode 100644 packages/api-contract-support/package.json delete mode 100644 packages/api-contract-support/src/detectPackage.ts delete mode 100644 packages/api-contract-support/src/index.ts delete mode 100644 packages/api-contract-support/src/packageInfo.ts delete mode 100644 packages/api-contract-support/tsconfig.json rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_delegator.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_dns.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_erc20.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_erc721.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_flipper.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_flipperBundle.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_incrementer.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v0_multisigPlain.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v1_flipper.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v2_erc20.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/ink_v2_flipper.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/solang_v0_ints256.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/user_v0_assetTransfer.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/user_v0_enumExample.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/user_v0_recursive.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/compare/user_v0_withString.test.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/accumulator.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/adder.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/delegator.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/delegator.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/dns.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/dns.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/erc20.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/erc20.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/erc721.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/erc721.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/flipper.contract.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/flipper.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/flipper.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/incrementer.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/incrementer.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/multisig_plain.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/multisig_plain.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/subber.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/trait-flipper.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v0/trait-flipper.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v1/flipper.contract.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v1/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v2/erc20.contract.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v2/flipper.contract.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/ink/v2/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/solang/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/solang/v0/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/solang/v0/ints256.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/solang/v0/ints256.sol (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/solang/v0/ints256.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/assetTransfer.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/assetTransfer.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/enumExample.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/enumExample.wasm (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/index.ts (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/recursive.contract.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/user/v0/withString.json (100%) rename packages/{api-contract-support/src => api-contract/src/test}/contracts/util.ts (100%) create mode 100644 packages/api-contract/tsconfig.spec.json rename packages/{types/src/codec => types-codec/src/base}/Compact.spec.ts (94%) rename packages/{types/src/codec => types-codec/src/base}/DoNotConstruct.spec.ts (84%) rename packages/{types/src/codec => types-codec/src/base}/Enum.spec.ts (99%) rename packages/{types/src/codec => types-codec/src/base}/Int.spec.ts (94%) rename packages/{types/src/primitive => types-codec/src/base}/Null.spec.ts (90%) rename packages/{types/src/codec => types-codec/src/base}/Option.spec.ts (97%) rename packages/{types/src/codec => types-codec/src/base}/Result.spec.ts (94%) rename packages/{types/src/codec => types-codec/src/base}/Tuple.spec.ts (93%) rename packages/{types/src/codec => types-codec/src/base}/UInt.spec.ts (98%) rename packages/{types/src/codec => types-codec/src/base}/Vec.spec.ts (94%) rename packages/{types/src/codec => types-codec/src/base}/VecFixed.spec.ts (94%) rename packages/{types/src/codec => types-codec/src/extended}/BTreeMap.spec.ts (96%) rename packages/{types/src/codec => types-codec/src/extended}/BTreeSet.spec.ts (95%) rename packages/{types/src/primitive => types-codec/src/extended}/BitVec.spec.ts (94%) rename packages/{types/src/primitive => types-codec/src/extended}/Bytes.spec.ts (94%) rename packages/{types/src/codec => types-codec/src/extended}/HashMap.spec.ts (82%) rename packages/{types/src/codec => types-codec/src/extended}/Linkage.spec.ts (92%) rename packages/{types/src/codec => types-codec/src/extended}/Map.spec.ts (96%) rename packages/{types/src/codec => types-codec/src/extended}/Range.spec.ts (86%) rename packages/{types/src/primitive => types-codec/src/extended}/Type.spec.ts (97%) rename packages/{types/src/codec => types-codec/src/extended}/U8aFixed.spec.ts (95%) rename packages/{types/src/codec => types-codec/src/extended}/WrapperOpaque.spec.ts (91%) rename packages/{types/src/primitive => types-codec/src/native}/Bool.spec.ts (95%) rename packages/{types/src/codec => types-codec/src/native}/Date.spec.ts (95%) rename packages/{types/src/codec => types-codec/src/native}/Raw.spec.ts (96%) rename packages/{types/src/codec => types-codec/src/native}/Set.spec.ts (96%) rename packages/{types/src/codec => types-codec/src/native}/Struct.data.ts (100%) rename packages/{types/src/codec => types-codec/src/native}/Struct.spec.ts (98%) rename packages/{types/src/primitive => types-codec/src/native}/Text.spec.ts (95%) create mode 100644 packages/types-codec/tsconfig.spec.json rename packages/{types/src/create => types-create/src/util}/encodeTypes.spec.ts (97%) rename packages/{types/src/create => types-create/src/util}/getTypeDef.spec.ts (99%) rename packages/{types/src/create => types-create/src/util}/typeSplit.spec.ts (96%) create mode 100644 packages/types-create/tsconfig.spec.json create mode 100644 packages/types/src/create/createClass.ts create mode 100644 packages/types/src/create/createType.ts diff --git a/jest.config.cjs b/jest.config.cjs index 2468408595..4770a4c536 100644 --- a/jest.config.cjs +++ b/jest.config.cjs @@ -6,7 +6,7 @@ const config = require('@polkadot/dev/config/jest.cjs'); module.exports = { ...config, moduleNameMapper: { - '@polkadot/api-(contract-support|contract|derive)(.*)$': '/packages/api-$1/src/$2', + '@polkadot/api-(contract|derive)(.*)$': '/packages/api-$1/src/$2', // eslint-disable-next-line sort-keys '@polkadot/api(.*)$': '/packages/api/src/$1', '@polkadot/rpc-(core|provider)(.*)$': '/packages/rpc-$1/src/$2', diff --git a/packages/api-contract-support/LICENSE b/packages/api-contract-support/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/api-contract-support/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/packages/api-contract-support/README.md b/packages/api-contract-support/README.md deleted file mode 100644 index e703235bb1..0000000000 --- a/packages/api-contract-support/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @polkadot/api-contract-support - -Test contracts diff --git a/packages/api-contract-support/package.json b/packages/api-contract-support/package.json deleted file mode 100644 index d9af40e0b2..0000000000 --- a/packages/api-contract-support/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "author": "Jaco Greeff ", - "bugs": "https://github.com/polkadot-js/api/issues", - "contributors": [], - "description": "Sample contracts as development support", - "engines": { - "node": ">=14.0.0" - }, - "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract-support#readme", - "license": "Apache-2.0", - "maintainers": [], - "name": "@polkadot/api-contract-support", - "repository": { - "directory": "packages/api-contract-support", - "type": "git", - "url": "https://github.com/polkadot-js/api.git" - }, - "sideEffects": [ - "./detectPackage.js", - "./detectPackage.cjs" - ], - "type": "module", - "version": "6.12.2-10", - "main": "index.js", - "dependencies": { - "@babel/runtime": "^7.16.5" - } -} diff --git a/packages/api-contract-support/src/detectPackage.ts b/packages/api-contract-support/src/detectPackage.ts deleted file mode 100644 index b50450e423..0000000000 --- a/packages/api-contract-support/src/detectPackage.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-support authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { detectPackage } from '@polkadot/util'; - -import { packageInfo } from './packageInfo'; - -detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, []); diff --git a/packages/api-contract-support/src/index.ts b/packages/api-contract-support/src/index.ts deleted file mode 100644 index 46aa6edd33..0000000000 --- a/packages/api-contract-support/src/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/types-support authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import './detectPackage'; - -export { packageInfo } from './packageInfo'; diff --git a/packages/api-contract-support/src/packageInfo.ts b/packages/api-contract-support/src/packageInfo.ts deleted file mode 100644 index 16a21706a1..0000000000 --- a/packages/api-contract-support/src/packageInfo.ts +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2017-2021 @polkadot/api-contract-support authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// Auto-generated by @polkadot/dev, do not edit - -export const packageInfo = { name: '@polkadot/api-contract-support', version: '6.12.2-10' }; diff --git a/packages/api-contract-support/tsconfig.json b/packages/api-contract-support/tsconfig.json deleted file mode 100644 index b6d2709520..0000000000 --- a/packages/api-contract-support/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "baseUrl": "..", - "outDir": "./build", - "rootDir": "./src", - "resolveJsonModule": true - }, - "include": ["src/**/*.json", "src/**/*.ts"], - "references": [] -} diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index 74b27dfcb5..08a77d8d0b 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -28,8 +28,5 @@ "@polkadot/types": "6.12.2-10", "@polkadot/util": "^8.1.2", "rxjs": "^7.4.0" - }, - "devDependencies": { - "@polkadot/api-contract-support": "6.12.2-10" } } diff --git a/packages/api-contract/src/Abi/Abi.spec.ts b/packages/api-contract/src/Abi/Abi.spec.ts index 95ccaed497..0866634c8c 100644 --- a/packages/api-contract/src/Abi/Abi.spec.ts +++ b/packages/api-contract/src/Abi/Abi.spec.ts @@ -6,10 +6,10 @@ import type { Registry } from '@polkadot/types/types'; import fs from 'fs'; import path from 'path'; -import abis from '@polkadot/api-contract-support/contracts'; import { TypeDefInfo } from '@polkadot/types/types'; import { blake2AsHex } from '@polkadot/util-crypto'; +import abis from '../test/contracts'; import { Abi } from '.'; interface SpecDef { @@ -80,7 +80,7 @@ describe('Abi', (): void => { it(`initializes from a contract ABI (${abiName})`, (): void => { const abi = new Abi(abis[abiName]); const json = stringifyJson(abi.registry); - const cmpPath = path.join(__dirname, `../../../api-contract-support/src/compare/${abiName}.test.json`); + const cmpPath = path.join(__dirname, `../test/compare/${abiName}.test.json`); try { // eslint-disable-next-line @typescript-eslint/no-var-requires diff --git a/packages/api-contract/src/Abi/toLatest.spec.ts b/packages/api-contract/src/Abi/toLatest.spec.ts index e0145211ec..f87b14a11c 100644 --- a/packages/api-contract/src/Abi/toLatest.spec.ts +++ b/packages/api-contract/src/Abi/toLatest.spec.ts @@ -1,10 +1,10 @@ // Copyright 2017-2021 @polkadot/api-contract authors & contributors // SPDX-License-Identifier: Apache-2.0 -import abis from '@polkadot/api-contract-support/contracts'; +import { v0ToLatest, v1ToLatest } from '@polkadot/api-contract/Abi/toLatest'; import { TypeRegistry } from '@polkadot/types'; -import { v0ToLatest, v1ToLatest } from './toLatest'; +import abis from '../test/contracts'; describe('v0ToLatest', (): void => { const registry = new TypeRegistry(); diff --git a/packages/api-contract/src/base/Code.spec.ts b/packages/api-contract/src/base/Code.spec.ts index a2c70fc29e..09509a5d87 100644 --- a/packages/api-contract/src/base/Code.spec.ts +++ b/packages/api-contract/src/base/Code.spec.ts @@ -5,14 +5,14 @@ import fs from 'fs'; import path from 'path'; import { toPromiseMethod } from '@polkadot/api'; -import v0contractFlipper from '@polkadot/api-contract-support/contracts/ink/v0/flipper.contract.json'; -import v0abiFlipper from '@polkadot/api-contract-support/contracts/ink/v0/flipper.json'; -import v1contractFlipper from '@polkadot/api-contract-support/contracts/ink/v1/flipper.contract.json'; +import v0contractFlipper from '../test/contracts/ink/v0/flipper.contract.json'; +import v0abiFlipper from '../test/contracts/ink/v0/flipper.json'; +import v1contractFlipper from '../test/contracts/ink/v1/flipper.contract.json'; import { Code } from './Code'; import { mockApi } from './mock'; -const v0wasmFlipper = fs.readFileSync(path.join(__dirname, '../../../api-contract-support/src/contracts/ink/v0/flipper.wasm')); +const v0wasmFlipper = fs.readFileSync(path.join(__dirname, '../test/contracts/ink/v0/flipper.wasm')); describe('Code', (): void => { it('can construct with an individual ABI/WASM combo', (): void => { diff --git a/packages/api-contract/src/checkTypes.manual.ts b/packages/api-contract/src/checkTypes.manual.ts index 9914326ab8..95f8afaedc 100644 --- a/packages/api-contract/src/checkTypes.manual.ts +++ b/packages/api-contract/src/checkTypes.manual.ts @@ -4,10 +4,10 @@ // Simple non-runnable checks to test type definitions in the editor itself import { ApiPromise } from '@polkadot/api'; -import abiIncrementer from '@polkadot/api-contract-support/contracts/ink/v0/incrementer.json'; +import { BlueprintPromise, ContractPromise } from '@polkadot/api-contract'; import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs'; -import { BlueprintPromise, ContractPromise } from '.'; +import abiIncrementer from './test/contracts/ink/v0/incrementer.json'; async function checkBlueprint (api: ApiPromise, pairs: TestKeyringMap): Promise { const blueprint = new BlueprintPromise(api, abiIncrementer as Record, '0x1234'); diff --git a/packages/api-contract-support/src/compare/ink_v0_delegator.test.json b/packages/api-contract/src/test/compare/ink_v0_delegator.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_delegator.test.json rename to packages/api-contract/src/test/compare/ink_v0_delegator.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_dns.test.json b/packages/api-contract/src/test/compare/ink_v0_dns.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_dns.test.json rename to packages/api-contract/src/test/compare/ink_v0_dns.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_erc20.test.json b/packages/api-contract/src/test/compare/ink_v0_erc20.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_erc20.test.json rename to packages/api-contract/src/test/compare/ink_v0_erc20.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_erc721.test.json b/packages/api-contract/src/test/compare/ink_v0_erc721.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_erc721.test.json rename to packages/api-contract/src/test/compare/ink_v0_erc721.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_flipper.test.json b/packages/api-contract/src/test/compare/ink_v0_flipper.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_flipper.test.json rename to packages/api-contract/src/test/compare/ink_v0_flipper.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_flipperBundle.test.json b/packages/api-contract/src/test/compare/ink_v0_flipperBundle.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_flipperBundle.test.json rename to packages/api-contract/src/test/compare/ink_v0_flipperBundle.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_incrementer.test.json b/packages/api-contract/src/test/compare/ink_v0_incrementer.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_incrementer.test.json rename to packages/api-contract/src/test/compare/ink_v0_incrementer.test.json diff --git a/packages/api-contract-support/src/compare/ink_v0_multisigPlain.test.json b/packages/api-contract/src/test/compare/ink_v0_multisigPlain.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v0_multisigPlain.test.json rename to packages/api-contract/src/test/compare/ink_v0_multisigPlain.test.json diff --git a/packages/api-contract-support/src/compare/ink_v1_flipper.test.json b/packages/api-contract/src/test/compare/ink_v1_flipper.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v1_flipper.test.json rename to packages/api-contract/src/test/compare/ink_v1_flipper.test.json diff --git a/packages/api-contract-support/src/compare/ink_v2_erc20.test.json b/packages/api-contract/src/test/compare/ink_v2_erc20.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v2_erc20.test.json rename to packages/api-contract/src/test/compare/ink_v2_erc20.test.json diff --git a/packages/api-contract-support/src/compare/ink_v2_flipper.test.json b/packages/api-contract/src/test/compare/ink_v2_flipper.test.json similarity index 100% rename from packages/api-contract-support/src/compare/ink_v2_flipper.test.json rename to packages/api-contract/src/test/compare/ink_v2_flipper.test.json diff --git a/packages/api-contract-support/src/compare/solang_v0_ints256.test.json b/packages/api-contract/src/test/compare/solang_v0_ints256.test.json similarity index 100% rename from packages/api-contract-support/src/compare/solang_v0_ints256.test.json rename to packages/api-contract/src/test/compare/solang_v0_ints256.test.json diff --git a/packages/api-contract-support/src/compare/user_v0_assetTransfer.test.json b/packages/api-contract/src/test/compare/user_v0_assetTransfer.test.json similarity index 100% rename from packages/api-contract-support/src/compare/user_v0_assetTransfer.test.json rename to packages/api-contract/src/test/compare/user_v0_assetTransfer.test.json diff --git a/packages/api-contract-support/src/compare/user_v0_enumExample.test.json b/packages/api-contract/src/test/compare/user_v0_enumExample.test.json similarity index 100% rename from packages/api-contract-support/src/compare/user_v0_enumExample.test.json rename to packages/api-contract/src/test/compare/user_v0_enumExample.test.json diff --git a/packages/api-contract-support/src/compare/user_v0_recursive.test.json b/packages/api-contract/src/test/compare/user_v0_recursive.test.json similarity index 100% rename from packages/api-contract-support/src/compare/user_v0_recursive.test.json rename to packages/api-contract/src/test/compare/user_v0_recursive.test.json diff --git a/packages/api-contract-support/src/compare/user_v0_withString.test.json b/packages/api-contract/src/test/compare/user_v0_withString.test.json similarity index 100% rename from packages/api-contract-support/src/compare/user_v0_withString.test.json rename to packages/api-contract/src/test/compare/user_v0_withString.test.json diff --git a/packages/api-contract-support/src/contracts/index.ts b/packages/api-contract/src/test/contracts/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/index.ts rename to packages/api-contract/src/test/contracts/index.ts diff --git a/packages/api-contract-support/src/contracts/ink/index.ts b/packages/api-contract/src/test/contracts/ink/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/ink/index.ts rename to packages/api-contract/src/test/contracts/ink/index.ts diff --git a/packages/api-contract-support/src/contracts/ink/v0/accumulator.wasm b/packages/api-contract/src/test/contracts/ink/v0/accumulator.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/accumulator.wasm rename to packages/api-contract/src/test/contracts/ink/v0/accumulator.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/adder.wasm b/packages/api-contract/src/test/contracts/ink/v0/adder.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/adder.wasm rename to packages/api-contract/src/test/contracts/ink/v0/adder.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/delegator.json b/packages/api-contract/src/test/contracts/ink/v0/delegator.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/delegator.json rename to packages/api-contract/src/test/contracts/ink/v0/delegator.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/delegator.wasm b/packages/api-contract/src/test/contracts/ink/v0/delegator.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/delegator.wasm rename to packages/api-contract/src/test/contracts/ink/v0/delegator.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/dns.json b/packages/api-contract/src/test/contracts/ink/v0/dns.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/dns.json rename to packages/api-contract/src/test/contracts/ink/v0/dns.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/dns.wasm b/packages/api-contract/src/test/contracts/ink/v0/dns.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/dns.wasm rename to packages/api-contract/src/test/contracts/ink/v0/dns.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/erc20.json b/packages/api-contract/src/test/contracts/ink/v0/erc20.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/erc20.json rename to packages/api-contract/src/test/contracts/ink/v0/erc20.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/erc20.wasm b/packages/api-contract/src/test/contracts/ink/v0/erc20.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/erc20.wasm rename to packages/api-contract/src/test/contracts/ink/v0/erc20.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/erc721.json b/packages/api-contract/src/test/contracts/ink/v0/erc721.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/erc721.json rename to packages/api-contract/src/test/contracts/ink/v0/erc721.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/erc721.wasm b/packages/api-contract/src/test/contracts/ink/v0/erc721.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/erc721.wasm rename to packages/api-contract/src/test/contracts/ink/v0/erc721.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/flipper.contract.json b/packages/api-contract/src/test/contracts/ink/v0/flipper.contract.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/flipper.contract.json rename to packages/api-contract/src/test/contracts/ink/v0/flipper.contract.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/flipper.json b/packages/api-contract/src/test/contracts/ink/v0/flipper.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/flipper.json rename to packages/api-contract/src/test/contracts/ink/v0/flipper.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/flipper.wasm b/packages/api-contract/src/test/contracts/ink/v0/flipper.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/flipper.wasm rename to packages/api-contract/src/test/contracts/ink/v0/flipper.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/incrementer.json b/packages/api-contract/src/test/contracts/ink/v0/incrementer.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/incrementer.json rename to packages/api-contract/src/test/contracts/ink/v0/incrementer.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/incrementer.wasm b/packages/api-contract/src/test/contracts/ink/v0/incrementer.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/incrementer.wasm rename to packages/api-contract/src/test/contracts/ink/v0/incrementer.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/index.ts b/packages/api-contract/src/test/contracts/ink/v0/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/index.ts rename to packages/api-contract/src/test/contracts/ink/v0/index.ts diff --git a/packages/api-contract-support/src/contracts/ink/v0/multisig_plain.json b/packages/api-contract/src/test/contracts/ink/v0/multisig_plain.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/multisig_plain.json rename to packages/api-contract/src/test/contracts/ink/v0/multisig_plain.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/multisig_plain.wasm b/packages/api-contract/src/test/contracts/ink/v0/multisig_plain.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/multisig_plain.wasm rename to packages/api-contract/src/test/contracts/ink/v0/multisig_plain.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/subber.wasm b/packages/api-contract/src/test/contracts/ink/v0/subber.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/subber.wasm rename to packages/api-contract/src/test/contracts/ink/v0/subber.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v0/trait-flipper.json b/packages/api-contract/src/test/contracts/ink/v0/trait-flipper.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/trait-flipper.json rename to packages/api-contract/src/test/contracts/ink/v0/trait-flipper.json diff --git a/packages/api-contract-support/src/contracts/ink/v0/trait-flipper.wasm b/packages/api-contract/src/test/contracts/ink/v0/trait-flipper.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v0/trait-flipper.wasm rename to packages/api-contract/src/test/contracts/ink/v0/trait-flipper.wasm diff --git a/packages/api-contract-support/src/contracts/ink/v1/flipper.contract.json b/packages/api-contract/src/test/contracts/ink/v1/flipper.contract.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v1/flipper.contract.json rename to packages/api-contract/src/test/contracts/ink/v1/flipper.contract.json diff --git a/packages/api-contract-support/src/contracts/ink/v1/index.ts b/packages/api-contract/src/test/contracts/ink/v1/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v1/index.ts rename to packages/api-contract/src/test/contracts/ink/v1/index.ts diff --git a/packages/api-contract-support/src/contracts/ink/v2/erc20.contract.json b/packages/api-contract/src/test/contracts/ink/v2/erc20.contract.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v2/erc20.contract.json rename to packages/api-contract/src/test/contracts/ink/v2/erc20.contract.json diff --git a/packages/api-contract-support/src/contracts/ink/v2/flipper.contract.json b/packages/api-contract/src/test/contracts/ink/v2/flipper.contract.json similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v2/flipper.contract.json rename to packages/api-contract/src/test/contracts/ink/v2/flipper.contract.json diff --git a/packages/api-contract-support/src/contracts/ink/v2/index.ts b/packages/api-contract/src/test/contracts/ink/v2/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/ink/v2/index.ts rename to packages/api-contract/src/test/contracts/ink/v2/index.ts diff --git a/packages/api-contract-support/src/contracts/solang/index.ts b/packages/api-contract/src/test/contracts/solang/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/solang/index.ts rename to packages/api-contract/src/test/contracts/solang/index.ts diff --git a/packages/api-contract-support/src/contracts/solang/v0/index.ts b/packages/api-contract/src/test/contracts/solang/v0/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/solang/v0/index.ts rename to packages/api-contract/src/test/contracts/solang/v0/index.ts diff --git a/packages/api-contract-support/src/contracts/solang/v0/ints256.json b/packages/api-contract/src/test/contracts/solang/v0/ints256.json similarity index 100% rename from packages/api-contract-support/src/contracts/solang/v0/ints256.json rename to packages/api-contract/src/test/contracts/solang/v0/ints256.json diff --git a/packages/api-contract-support/src/contracts/solang/v0/ints256.sol b/packages/api-contract/src/test/contracts/solang/v0/ints256.sol similarity index 100% rename from packages/api-contract-support/src/contracts/solang/v0/ints256.sol rename to packages/api-contract/src/test/contracts/solang/v0/ints256.sol diff --git a/packages/api-contract-support/src/contracts/solang/v0/ints256.wasm b/packages/api-contract/src/test/contracts/solang/v0/ints256.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/solang/v0/ints256.wasm rename to packages/api-contract/src/test/contracts/solang/v0/ints256.wasm diff --git a/packages/api-contract-support/src/contracts/user/index.ts b/packages/api-contract/src/test/contracts/user/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/user/index.ts rename to packages/api-contract/src/test/contracts/user/index.ts diff --git a/packages/api-contract-support/src/contracts/user/v0/assetTransfer.json b/packages/api-contract/src/test/contracts/user/v0/assetTransfer.json similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/assetTransfer.json rename to packages/api-contract/src/test/contracts/user/v0/assetTransfer.json diff --git a/packages/api-contract-support/src/contracts/user/v0/assetTransfer.wasm b/packages/api-contract/src/test/contracts/user/v0/assetTransfer.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/assetTransfer.wasm rename to packages/api-contract/src/test/contracts/user/v0/assetTransfer.wasm diff --git a/packages/api-contract-support/src/contracts/user/v0/enumExample.json b/packages/api-contract/src/test/contracts/user/v0/enumExample.json similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/enumExample.json rename to packages/api-contract/src/test/contracts/user/v0/enumExample.json diff --git a/packages/api-contract-support/src/contracts/user/v0/enumExample.wasm b/packages/api-contract/src/test/contracts/user/v0/enumExample.wasm similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/enumExample.wasm rename to packages/api-contract/src/test/contracts/user/v0/enumExample.wasm diff --git a/packages/api-contract-support/src/contracts/user/v0/index.ts b/packages/api-contract/src/test/contracts/user/v0/index.ts similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/index.ts rename to packages/api-contract/src/test/contracts/user/v0/index.ts diff --git a/packages/api-contract-support/src/contracts/user/v0/recursive.contract.json b/packages/api-contract/src/test/contracts/user/v0/recursive.contract.json similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/recursive.contract.json rename to packages/api-contract/src/test/contracts/user/v0/recursive.contract.json diff --git a/packages/api-contract-support/src/contracts/user/v0/withString.json b/packages/api-contract/src/test/contracts/user/v0/withString.json similarity index 100% rename from packages/api-contract-support/src/contracts/user/v0/withString.json rename to packages/api-contract/src/test/contracts/user/v0/withString.json diff --git a/packages/api-contract-support/src/contracts/util.ts b/packages/api-contract/src/test/contracts/util.ts similarity index 100% rename from packages/api-contract-support/src/contracts/util.ts rename to packages/api-contract/src/test/contracts/util.ts diff --git a/packages/api-contract/tsconfig.json b/packages/api-contract/tsconfig.json index 773942d4c4..de3def31de 100644 --- a/packages/api-contract/tsconfig.json +++ b/packages/api-contract/tsconfig.json @@ -3,12 +3,18 @@ "compilerOptions": { "baseUrl": "..", "outDir": "./build", - "rootDir": "./src", - "resolveJsonModule": true + "rootDir": "./src" }, + "exclude": [ + "**/test/**/*.json", + "**/test/**/*.ts", + "**/test/**/*.wasm", + "**/*.manual.ts", + "**/*.spec.ts", + "mock.ts" + ], "references": [ { "path": "../api" }, - { "path": "../api-contract-support" }, { "path": "../types" } ] } diff --git a/packages/api-contract/tsconfig.spec.json b/packages/api-contract/tsconfig.spec.json new file mode 100644 index 0000000000..e2bfd5840a --- /dev/null +++ b/packages/api-contract/tsconfig.spec.json @@ -0,0 +1,24 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "emitDeclarationOnly": false, + "resolveJsonModule": true, + "noEmit": true + }, + "include": [ + "**/test/**/*.json", + "**/test/**/*.ts", + "**/test/**/*.wasm", + "**/*.manual.ts", + "**/*.spec.ts", + "mock.ts" + ], + "references": [ + { "path": "../api" }, + { "path": "../api-contract" }, + { "path": "../types" } + ] +} diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json index 6c2c6aff6c..e45ab1b953 100644 --- a/packages/types-codec/package.json +++ b/packages/types-codec/package.json @@ -25,5 +25,8 @@ "dependencies": { "@babel/runtime": "^7.16.5", "@polkadot/util": "^8.1.2" + }, + "devDependencies": { + "@polkadot/types": "^6.12.2-9" } } diff --git a/packages/types/src/codec/Compact.spec.ts b/packages/types-codec/src/base/Compact.spec.ts similarity index 94% rename from packages/types/src/codec/Compact.spec.ts rename to packages/types-codec/src/base/Compact.spec.ts index eebbb76baf..d0e428dd12 100644 --- a/packages/types/src/codec/Compact.spec.ts +++ b/packages/types-codec/src/base/Compact.spec.ts @@ -1,13 +1,10 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { CodecDate } from '@polkadot/types-codec'; +import { TypeRegistry } from '@polkadot/types'; +import { CodecDate, Compact, U32 } from '@polkadot/types-codec'; import { BN } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { U32 } from '../primitive'; -import { Compact } from '.'; - describe('Compact', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/DoNotConstruct.spec.ts b/packages/types-codec/src/base/DoNotConstruct.spec.ts similarity index 84% rename from packages/types/src/codec/DoNotConstruct.spec.ts rename to packages/types-codec/src/base/DoNotConstruct.spec.ts index f675f9ae45..4ff489be5f 100644 --- a/packages/types/src/codec/DoNotConstruct.spec.ts +++ b/packages/types-codec/src/base/DoNotConstruct.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { DoNotConstruct } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { DoNotConstruct } from '@polkadot/types-codec'; describe('DoNotConstruct', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Enum.spec.ts b/packages/types-codec/src/base/Enum.spec.ts similarity index 99% rename from packages/types/src/codec/Enum.spec.ts rename to packages/types-codec/src/base/Enum.spec.ts index cda8128d6f..8c2648b1f6 100644 --- a/packages/types/src/codec/Enum.spec.ts +++ b/packages/types-codec/src/base/Enum.spec.ts @@ -3,12 +3,10 @@ import type { CodecRegistry } from '@polkadot/types-codec/types'; +import { TypeRegistry } from '@polkadot/types'; +import { Enum, Null, Text, U32 } from '@polkadot/types-codec'; import { u8aToHex } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { Null, Text, U32 } from '../primitive'; -import { Enum } from '.'; - describe('Enum', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Int.spec.ts b/packages/types-codec/src/base/Int.spec.ts similarity index 94% rename from packages/types/src/codec/Int.spec.ts rename to packages/types-codec/src/base/Int.spec.ts index acf52da51e..721f89de8e 100644 --- a/packages/types/src/codec/Int.spec.ts +++ b/packages/types-codec/src/base/Int.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Int } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Int } from '@polkadot/types-codec'; describe('Int', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Null.spec.ts b/packages/types-codec/src/base/Null.spec.ts similarity index 90% rename from packages/types/src/primitive/Null.spec.ts rename to packages/types-codec/src/base/Null.spec.ts index 3c862f39c5..a208d3ee9f 100644 --- a/packages/types/src/primitive/Null.spec.ts +++ b/packages/types-codec/src/base/Null.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Null } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Null } from '@polkadot/types-codec'; describe('Null', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Option.spec.ts b/packages/types-codec/src/base/Option.spec.ts similarity index 97% rename from packages/types/src/codec/Option.spec.ts rename to packages/types-codec/src/base/Option.spec.ts index a5b433c5d8..a7ad5f243c 100644 --- a/packages/types/src/codec/Option.spec.ts +++ b/packages/types-codec/src/base/Option.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Bytes, Text, U32 } from '../primitive'; -import { Option } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Bytes, Option, Text, U32 } from '@polkadot/types-codec'; const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Result.spec.ts b/packages/types-codec/src/base/Result.spec.ts similarity index 94% rename from packages/types/src/codec/Result.spec.ts rename to packages/types-codec/src/base/Result.spec.ts index f6c8716085..aeca0ba196 100644 --- a/packages/types/src/codec/Result.spec.ts +++ b/packages/types-codec/src/base/Result.spec.ts @@ -1,12 +1,10 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 +import { TypeRegistry } from '@polkadot/types'; +import { Result, Text, u32 } from '@polkadot/types-codec'; import { hexToString } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { Text, u32 } from '../primitive'; -import { Result } from '.'; - describe('Result', (): void => { const registry = new TypeRegistry(); const Type = Result.with({ Err: Text, Ok: u32 }); diff --git a/packages/types/src/codec/Tuple.spec.ts b/packages/types-codec/src/base/Tuple.spec.ts similarity index 93% rename from packages/types/src/codec/Tuple.spec.ts rename to packages/types-codec/src/base/Tuple.spec.ts index ce319f2351..73142b5262 100644 --- a/packages/types/src/codec/Tuple.spec.ts +++ b/packages/types-codec/src/base/Tuple.spec.ts @@ -1,17 +1,13 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 +import type { BlockNumber, VoteThreshold } from '@polkadot/types/interfaces'; import type { AnyTupleValue, CodecTo } from '@polkadot/types-codec/types'; -import type { VoteThreshold } from '../interfaces/elections'; -import type { BlockNumber } from '../interfaces/runtime'; +import { Metadata, TypeRegistry } from '@polkadot/types'; +import { Text, Tuple, U32, U128 } from '@polkadot/types-codec'; import rpcMetadata from '@polkadot/types-support/metadata/static-substrate'; -import { TypeRegistry } from '../create'; -import { Metadata } from '../metadata'; -import { Text, U32, U128 } from '../primitive'; -import { Tuple } from '.'; - describe('Tuple', (): void => { const registry = new TypeRegistry(); let tuple: Tuple; diff --git a/packages/types/src/codec/UInt.spec.ts b/packages/types-codec/src/base/UInt.spec.ts similarity index 98% rename from packages/types/src/codec/UInt.spec.ts rename to packages/types-codec/src/base/UInt.spec.ts index 3bd54e175c..3ddce6738e 100644 --- a/packages/types/src/codec/UInt.spec.ts +++ b/packages/types-codec/src/base/UInt.spec.ts @@ -1,11 +1,10 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 +import { TypeRegistry } from '@polkadot/types'; +import { UInt } from '@polkadot/types-codec'; import { BN, BN_TWO, isBn } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { UInt } from '.'; - describe('UInt', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Vec.spec.ts b/packages/types-codec/src/base/Vec.spec.ts similarity index 94% rename from packages/types/src/codec/Vec.spec.ts rename to packages/types-codec/src/base/Vec.spec.ts index d0f8bb1967..3f67ac8649 100644 --- a/packages/types/src/codec/Vec.spec.ts +++ b/packages/types-codec/src/base/Vec.spec.ts @@ -1,18 +1,14 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { PropIndex } from '../interfaces/democracy'; -import type { Codec, CodecTo, ITuple } from '../types'; +import type { PropIndex } from '@polkadot/types/interfaces/democracy'; +import type { Codec, CodecTo, ITuple } from '@polkadot/types-codec/types'; +import { createTypeUnsafe, GenericAccountId as AccountId, Metadata, TypeRegistry } from '@polkadot/types'; +import { Text, Vec } from '@polkadot/types-codec'; import rpcMetadata from '@polkadot/types-support/metadata/static-substrate'; import { randomAsU8a } from '@polkadot/util-crypto'; -import { createTypeUnsafe, TypeRegistry } from '../create'; -import { GenericAccountId as AccountId } from '../generic'; -import { Metadata } from '../metadata'; -import { Text } from '../primitive'; -import { Vec } from '.'; - const registry = new TypeRegistry(); const metadata = new Metadata(registry, rpcMetadata); diff --git a/packages/types/src/codec/VecFixed.spec.ts b/packages/types-codec/src/base/VecFixed.spec.ts similarity index 94% rename from packages/types/src/codec/VecFixed.spec.ts rename to packages/types-codec/src/base/VecFixed.spec.ts index 1c6ac8334d..5343039a88 100644 --- a/packages/types/src/codec/VecFixed.spec.ts +++ b/packages/types-codec/src/base/VecFixed.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Text, u16 } from '../primitive'; -import { VecFixed } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Text, u16, VecFixed } from '@polkadot/types-codec'; describe('VecFixed', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/BTreeMap.spec.ts b/packages/types-codec/src/extended/BTreeMap.spec.ts similarity index 96% rename from packages/types/src/codec/BTreeMap.spec.ts rename to packages/types-codec/src/extended/BTreeMap.spec.ts index 1f4563f22f..9bb770587c 100644 --- a/packages/types/src/codec/BTreeMap.spec.ts +++ b/packages/types-codec/src/extended/BTreeMap.spec.ts @@ -1,15 +1,14 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { I32, Text, U32 } from '../primitive'; -import { Constructor } from '../types'; -import { ITuple } from '../types/interfaces'; -import { BTreeMap, Enum, Struct, Tuple } from '.'; +import type { CodecClass, ITuple } from '@polkadot/types-codec/types'; + +import { TypeRegistry } from '@polkadot/types'; +import { BTreeMap, Enum, I32, Struct, Text, Tuple, U32 } from '@polkadot/types-codec'; const registry = new TypeRegistry(); -class U32TextTuple extends (Tuple.with([U32, Text]) as unknown as Constructor>) {} +class U32TextTuple extends (Tuple.with([U32, Text]) as unknown as CodecClass>) {} // Reason: We purposefully want `text` to be the first key of the struct and take priority during sorting // eslint-disable-next-line sort-keys class MockStruct extends Struct.with({ text: Text, int: I32 }) {} diff --git a/packages/types/src/codec/BTreeSet.spec.ts b/packages/types-codec/src/extended/BTreeSet.spec.ts similarity index 95% rename from packages/types/src/codec/BTreeSet.spec.ts rename to packages/types-codec/src/extended/BTreeSet.spec.ts index c5d3ab8742..5a91fbb375 100644 --- a/packages/types/src/codec/BTreeSet.spec.ts +++ b/packages/types-codec/src/extended/BTreeSet.spec.ts @@ -1,17 +1,16 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { CodecTo } from '@polkadot/types-codec/types'; +import type { CodecClass, CodecTo } from '@polkadot/types-codec/types'; + +import { TypeRegistry } from '@polkadot/types'; +import { BTreeSet, Enum, I32, Struct, Text, Tuple, U32 } from '@polkadot/types-codec'; -import { TypeRegistry } from '../create'; -import { I32, Text, U32 } from '../primitive'; -import { Constructor } from '../types'; import { ITuple } from '../types/interfaces'; -import { BTreeSet, Enum, Struct, Tuple } from '.'; const registry = new TypeRegistry(); -class U32TextTuple extends (Tuple.with([U32, Text]) as unknown as Constructor>) {} +class U32TextTuple extends (Tuple.with([U32, Text]) as unknown as CodecClass>) {} // Reason: We purposefully want `text` to be the first key of the struct and take priority during sorting // eslint-disable-next-line sort-keys class MockStruct extends Struct.with({ text: Text, int: I32 }) {} diff --git a/packages/types/src/primitive/BitVec.spec.ts b/packages/types-codec/src/extended/BitVec.spec.ts similarity index 94% rename from packages/types/src/primitive/BitVec.spec.ts rename to packages/types-codec/src/extended/BitVec.spec.ts index f2ac884b6a..9e06c6fb3f 100644 --- a/packages/types/src/primitive/BitVec.spec.ts +++ b/packages/types-codec/src/extended/BitVec.spec.ts @@ -1,9 +1,9 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 +import { TypeRegistry } from '@polkadot/types'; import { hexToU8a } from '@polkadot/util'; -import { TypeRegistry } from '../create'; import { BitVec } from './'; // form Inclusion BitVec diff --git a/packages/types/src/primitive/Bytes.spec.ts b/packages/types-codec/src/extended/Bytes.spec.ts similarity index 94% rename from packages/types/src/primitive/Bytes.spec.ts rename to packages/types-codec/src/extended/Bytes.spec.ts index f4ab8ecec2..7049ee4d1f 100644 --- a/packages/types/src/primitive/Bytes.spec.ts +++ b/packages/types-codec/src/extended/Bytes.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Bytes } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Bytes } from '@polkadot/types-codec'; describe('Bytes', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/HashMap.spec.ts b/packages/types-codec/src/extended/HashMap.spec.ts similarity index 82% rename from packages/types/src/codec/HashMap.spec.ts rename to packages/types-codec/src/extended/HashMap.spec.ts index abdee4f91f..bd07fcce58 100644 --- a/packages/types/src/codec/HashMap.spec.ts +++ b/packages/types-codec/src/extended/HashMap.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { Text, U32 } from '../primitive'; -import { HashMap, Struct } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { HashMap, Struct, Text, U32 } from '@polkadot/types-codec'; const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Linkage.spec.ts b/packages/types-codec/src/extended/Linkage.spec.ts similarity index 92% rename from packages/types/src/codec/Linkage.spec.ts rename to packages/types-codec/src/extended/Linkage.spec.ts index 3bf66ca70e..77ce0c4541 100644 --- a/packages/types/src/codec/Linkage.spec.ts +++ b/packages/types-codec/src/extended/Linkage.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create/registry'; -import { Linkage } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Linkage } from '@polkadot/types-codec'; const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Map.spec.ts b/packages/types-codec/src/extended/Map.spec.ts similarity index 96% rename from packages/types/src/codec/Map.spec.ts rename to packages/types-codec/src/extended/Map.spec.ts index f9f9ab609b..97a1deff7f 100644 --- a/packages/types/src/codec/Map.spec.ts +++ b/packages/types-codec/src/extended/Map.spec.ts @@ -3,9 +3,8 @@ import type { CodecTo } from '@polkadot/types-codec/types'; -import { TypeRegistry } from '../create'; -import { Text, U32 } from '../primitive'; -import { CodecMap } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { CodecMap, Text, U32 } from '@polkadot/types-codec'; const registry = new TypeRegistry(); const mockU32TextMap = new Map(); diff --git a/packages/types/src/codec/Range.spec.ts b/packages/types-codec/src/extended/Range.spec.ts similarity index 86% rename from packages/types/src/codec/Range.spec.ts rename to packages/types-codec/src/extended/Range.spec.ts index 287574b732..5dd32b89a7 100644 --- a/packages/types/src/codec/Range.spec.ts +++ b/packages/types-codec/src/extended/Range.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { U32 } from '../primitive'; -import { Range } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Range, U32 } from '@polkadot/types-codec'; describe('Range', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Type.spec.ts b/packages/types-codec/src/extended/Type.spec.ts similarity index 97% rename from packages/types/src/primitive/Type.spec.ts rename to packages/types-codec/src/extended/Type.spec.ts index d06ca3aee7..81cb240d9d 100644 --- a/packages/types/src/primitive/Type.spec.ts +++ b/packages/types-codec/src/extended/Type.spec.ts @@ -1,11 +1,10 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 +import { TypeRegistry } from '@polkadot/types'; +import { Text, Type } from '@polkadot/types-codec'; import { stringToU8a, u8aConcat } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { Text, Type } from '.'; - describe('Type', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/U8aFixed.spec.ts b/packages/types-codec/src/extended/U8aFixed.spec.ts similarity index 95% rename from packages/types/src/codec/U8aFixed.spec.ts rename to packages/types-codec/src/extended/U8aFixed.spec.ts index 04ffb72475..dc96c8ab1e 100644 --- a/packages/types/src/codec/U8aFixed.spec.ts +++ b/packages/types-codec/src/extended/U8aFixed.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { U8aFixed } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { U8aFixed } from '@polkadot/types-codec'; describe('U8aFixed', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/WrapperOpaque.spec.ts b/packages/types-codec/src/extended/WrapperOpaque.spec.ts similarity index 91% rename from packages/types/src/codec/WrapperOpaque.spec.ts rename to packages/types-codec/src/extended/WrapperOpaque.spec.ts index 7f8b272afd..8a0782a0b3 100644 --- a/packages/types/src/codec/WrapperOpaque.spec.ts +++ b/packages/types-codec/src/extended/WrapperOpaque.spec.ts @@ -1,8 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeRegistry } from '../create'; -import { WrapperOpaque } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { WrapperOpaque } from '@polkadot/types-codec'; describe('WrapperOpaque', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Bool.spec.ts b/packages/types-codec/src/native/Bool.spec.ts similarity index 95% rename from packages/types/src/primitive/Bool.spec.ts rename to packages/types-codec/src/native/Bool.spec.ts index 93aa3591c9..4f7a943002 100644 --- a/packages/types/src/primitive/Bool.spec.ts +++ b/packages/types-codec/src/native/Bool.spec.ts @@ -3,8 +3,8 @@ import type { CodecTo } from '@polkadot/types-codec/types'; -import { TypeRegistry } from '../create'; -import { Bool } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Bool } from '@polkadot/types-codec'; describe('Bool', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Date.spec.ts b/packages/types-codec/src/native/Date.spec.ts similarity index 95% rename from packages/types/src/codec/Date.spec.ts rename to packages/types-codec/src/native/Date.spec.ts index 130a9b7265..7af4fb833e 100644 --- a/packages/types/src/codec/Date.spec.ts +++ b/packages/types-codec/src/native/Date.spec.ts @@ -3,12 +3,10 @@ import type { CodecTo } from '@polkadot/types-codec/types'; -import { CodecDate } from '@polkadot/types-codec'; +import { TypeRegistry } from '@polkadot/types'; +import { CodecDate, U64 } from '@polkadot/types-codec'; import { BN } from '@polkadot/util'; -import { TypeRegistry } from '../create'; -import { U64 } from '../primitive'; - describe('Date', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Raw.spec.ts b/packages/types-codec/src/native/Raw.spec.ts similarity index 96% rename from packages/types/src/codec/Raw.spec.ts rename to packages/types-codec/src/native/Raw.spec.ts index 5b6f6b320c..0a4894eccb 100644 --- a/packages/types/src/codec/Raw.spec.ts +++ b/packages/types-codec/src/native/Raw.spec.ts @@ -3,8 +3,8 @@ import type { AnyU8a, CodecTo } from '@polkadot/types-codec/types'; -import { TypeRegistry } from '../create'; -import { Raw } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Raw } from '@polkadot/types-codec'; const registry = new TypeRegistry(); diff --git a/packages/types/src/codec/Set.spec.ts b/packages/types-codec/src/native/Set.spec.ts similarity index 96% rename from packages/types/src/codec/Set.spec.ts rename to packages/types-codec/src/native/Set.spec.ts index 70f091052e..345d4b1b59 100644 --- a/packages/types/src/codec/Set.spec.ts +++ b/packages/types-codec/src/native/Set.spec.ts @@ -3,8 +3,8 @@ /* eslint-disable sort-keys */ -import { TypeRegistry } from '../create'; -import { CodecSet } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { CodecSet } from '@polkadot/types-codec'; // TODO actually import these from definitions, don't re-define here const SET_FIELDS = { diff --git a/packages/types/src/codec/Struct.data.ts b/packages/types-codec/src/native/Struct.data.ts similarity index 100% rename from packages/types/src/codec/Struct.data.ts rename to packages/types-codec/src/native/Struct.data.ts diff --git a/packages/types/src/codec/Struct.spec.ts b/packages/types-codec/src/native/Struct.spec.ts similarity index 98% rename from packages/types/src/codec/Struct.spec.ts rename to packages/types-codec/src/native/Struct.spec.ts index 2e6e7404fe..201eaebb47 100644 --- a/packages/types/src/codec/Struct.spec.ts +++ b/packages/types-codec/src/native/Struct.spec.ts @@ -5,10 +5,10 @@ import type { CodecTo } from '@polkadot/types-codec/types'; -import { TypeRegistry } from '../create'; -import { Text, U32 } from '../primitive'; +import { TypeRegistry } from '@polkadot/types'; +import { Enum, Struct, Text, U32, Vec } from '@polkadot/types-codec'; + import { TEST_A } from './Struct.data'; -import { Enum, Struct, Vec } from '.'; describe('Struct', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/primitive/Text.spec.ts b/packages/types-codec/src/native/Text.spec.ts similarity index 95% rename from packages/types/src/primitive/Text.spec.ts rename to packages/types-codec/src/native/Text.spec.ts index fedd71b499..889457f370 100644 --- a/packages/types/src/primitive/Text.spec.ts +++ b/packages/types-codec/src/native/Text.spec.ts @@ -3,10 +3,8 @@ import type { CodecTo } from '@polkadot/types-codec/types'; -import { Raw } from '@polkadot/types-codec'; - -import { TypeRegistry } from '../create'; -import { Bytes, Text } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { Bytes, Raw, Text } from '@polkadot/types-codec'; describe('Text', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types-codec/src/utils/sanitize.spec.ts b/packages/types-codec/src/utils/sanitize.spec.ts index f81c5ca2a3..7829b49fe2 100644 --- a/packages/types-codec/src/utils/sanitize.spec.ts +++ b/packages/types-codec/src/utils/sanitize.spec.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { alias, flattenSingleTuple, removeColons, removeExtensions } from './sanitize'; +import { alias, flattenSingleTuple, removeColons, removeExtensions } from '@polkadot/types-codec/utils/sanitize'; describe('sanitize', (): void => { describe('alias', (): void => { diff --git a/packages/types-codec/tsconfig.json b/packages/types-codec/tsconfig.json index 7212e74684..d8a5f9b2f2 100644 --- a/packages/types-codec/tsconfig.json +++ b/packages/types-codec/tsconfig.json @@ -6,5 +6,9 @@ "rootDir": "./src", "resolveJsonModule": true }, + "exclude": [ + "**/*.data.ts", + "**/*.spec.ts" + ], "references": [] } diff --git a/packages/types-codec/tsconfig.spec.json b/packages/types-codec/tsconfig.spec.json new file mode 100644 index 0000000000..7c7f626415 --- /dev/null +++ b/packages/types-codec/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "emitDeclarationOnly": false, + "resolveJsonModule": true, + "noEmit": true + }, + "include": [ + "**/*.data.ts", + "**/*.spec.ts" + ], + "references": [ + { "path": "../types" }, + { "path": "../types-codec" }, + { "path": "../types-support" } + ] +} diff --git a/packages/types/src/create/encodeTypes.spec.ts b/packages/types-create/src/util/encodeTypes.spec.ts similarity index 97% rename from packages/types/src/create/encodeTypes.spec.ts rename to packages/types-create/src/util/encodeTypes.spec.ts index f283edc23a..0894e91874 100644 --- a/packages/types/src/create/encodeTypes.spec.ts +++ b/packages/types-create/src/util/encodeTypes.spec.ts @@ -1,10 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeDefInfo } from '@polkadot/types-create'; - -import { TypeRegistry } from './registry'; -import { encodeTypeDef } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { encodeTypeDef, TypeDefInfo } from '@polkadot/types-create'; describe('encodeTypeDef', (): void => { const registry = new TypeRegistry(); diff --git a/packages/types/src/create/getTypeDef.spec.ts b/packages/types-create/src/util/getTypeDef.spec.ts similarity index 99% rename from packages/types/src/create/getTypeDef.spec.ts rename to packages/types-create/src/util/getTypeDef.spec.ts index 96c2378700..d5fece58cb 100644 --- a/packages/types/src/create/getTypeDef.spec.ts +++ b/packages/types-create/src/util/getTypeDef.spec.ts @@ -1,9 +1,8 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { TypeDefInfo } from '@polkadot/types-create'; - -import { getTypeDef, TypeRegistry } from '.'; +import { TypeRegistry } from '@polkadot/types'; +import { getTypeDef, TypeDefInfo } from '@polkadot/types-create'; describe('getTypeDef', (): void => { it('maps empty tuples to empty tuple', (): void => { diff --git a/packages/types/src/create/typeSplit.spec.ts b/packages/types-create/src/util/typeSplit.spec.ts similarity index 96% rename from packages/types/src/create/typeSplit.spec.ts rename to packages/types-create/src/util/typeSplit.spec.ts index 9e7607733f..009827e13e 100644 --- a/packages/types/src/create/typeSplit.spec.ts +++ b/packages/types-create/src/util/typeSplit.spec.ts @@ -1,7 +1,7 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { typeSplit } from '.'; +import { typeSplit } from '@polkadot/types-create'; describe('typeSplit', (): void => { it('splits simple types into an array', (): void => { diff --git a/packages/types-create/tsconfig.json b/packages/types-create/tsconfig.json index c477fce8b3..84e46eeac7 100644 --- a/packages/types-create/tsconfig.json +++ b/packages/types-create/tsconfig.json @@ -6,6 +6,9 @@ "rootDir": "./src", "resolveJsonModule": true }, + "exclude": [ + "**/*.spec.ts" + ], "references": [ { "path": "../types-codec" } ] diff --git a/packages/types-create/tsconfig.spec.json b/packages/types-create/tsconfig.spec.json new file mode 100644 index 0000000000..2c0779298e --- /dev/null +++ b/packages/types-create/tsconfig.spec.json @@ -0,0 +1,19 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src", + "emitDeclarationOnly": false, + "resolveJsonModule": true, + "noEmit": true + }, + "include": [ + "**/*.spec.ts" + ], + "references": [ + { "path": "../types" }, + { "path": "../types-codec" }, + { "path": "../types-create" } + ] +} diff --git a/packages/types/src/create/createClass.ts b/packages/types/src/create/createClass.ts new file mode 100644 index 0000000000..dfe92ee2cc --- /dev/null +++ b/packages/types/src/create/createClass.ts @@ -0,0 +1,11 @@ +// Copyright 2017-2021 @polkadot/types authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { Codec, CodecClass, CodecRegistry } from '@polkadot/types-codec/types'; +import type { DetectCodec } from '../types'; + +import { createClassUnsafe } from '@polkadot/types-create'; + +export function createClass (registry: CodecRegistry, type: K): CodecClass> { + return createClassUnsafe(registry, type); +} diff --git a/packages/types/src/create/createType.ts b/packages/types/src/create/createType.ts new file mode 100644 index 0000000000..abe2d61a93 --- /dev/null +++ b/packages/types/src/create/createType.ts @@ -0,0 +1,17 @@ +// Copyright 2017-2021 @polkadot/types authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { Codec, CodecRegistry } from '@polkadot/types-codec/types'; +import type { DetectCodec } from '../types'; + +import { createTypeUnsafe } from '@polkadot/types-create'; + +/** + * Create an instance of a `type` with a given `params`. + * @param type - A recognizable string representing the type to create an + * instance from + * @param params - The value to instantiate the type with + */ +export function createType (registry: CodecRegistry, type: K, ...params: unknown[]): DetectCodec { + return createTypeUnsafe(registry, type, params); +} diff --git a/packages/types/src/create/index.ts b/packages/types/src/create/index.ts index 7e2836ab74..155e190986 100644 --- a/packages/types/src/create/index.ts +++ b/packages/types/src/create/index.ts @@ -1,26 +1,9 @@ // Copyright 2017-2021 @polkadot/types authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { Codec, CodecClass, CodecRegistry } from '@polkadot/types-codec/types'; -import type { DetectCodec } from '../types'; - -import { createClassUnsafe, createTypeUnsafe } from '@polkadot/types-create'; - export * from '@polkadot/types-create'; +export * from './createClass'; +export * from './createType'; export * from './lazy'; export * from './registry'; - -export function createClass (registry: CodecRegistry, type: K): CodecClass> { - return createClassUnsafe(registry, type); -} - -/** - * Create an instance of a `type` with a given `params`. - * @param type - A recognizable string representing the type to create an - * instance from - * @param params - The value to instantiate the type with - */ -export function createType (registry: CodecRegistry, type: K, ...params: unknown[]): DetectCodec { - return createTypeUnsafe(registry, type, params); -} diff --git a/packages/types/src/create/registry.spec.ts b/packages/types/src/create/registry.spec.ts index f1da04db20..61edd18a97 100644 --- a/packages/types/src/create/registry.spec.ts +++ b/packages/types/src/create/registry.spec.ts @@ -5,11 +5,10 @@ import type { Codec, CodecClass } from '@polkadot/types-codec/types'; -import { DoNotConstruct, Struct } from '@polkadot/types-codec'; +import { DoNotConstruct, Struct, Text, U32 } from '@polkadot/types-codec'; import { isChildClass, u8aToU8a } from '@polkadot/util'; import { keccakAsU8a } from '@polkadot/util-crypto'; -import { Text, U32 } from '../primitive'; import { TypeRegistry } from '.'; describe('TypeRegistry', (): void => { diff --git a/tsconfig.base.json b/tsconfig.base.json index 4172610024..465a30f3fe 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -7,7 +7,6 @@ "@polkadot/api/*": ["api/src/*"], "@polkadot/api-contract": ["api-contract/src"], "@polkadot/api-contract/*": ["api-contract/src/*"], - "@polkadot/api-contract-support/*": ["api-contract-support/src/*"], "@polkadot/api-derive": ["api-derive/src"], "@polkadot/api-derive/*": ["api-derive/src/*"], "@polkadot/rpc-core": ["rpc-core/src"], diff --git a/tsconfig.json b/tsconfig.json index 7488bdceb9..c31fd07b87 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,14 +6,16 @@ "references": [ { "path": "./packages/api" }, { "path": "./packages/api-contract" }, - { "path": "./packages/api-contract-support" }, + { "path": "./packages/api-contract/tsconfig.spec.json" }, { "path": "./packages/api-derive" }, { "path": "./packages/rpc-core" }, { "path": "./packages/rpc-provider" }, { "path": "./packages/typegen" }, { "path": "./packages/types" }, { "path": "./packages/types-codec" }, + { "path": "./packages/types-codec/tsconfig.spec.json" }, { "path": "./packages/types-create" }, + { "path": "./packages/types-create/tsconfig.spec.json" }, { "path": "./packages/types-known" }, { "path": "./packages/types-support" } ] diff --git a/yarn.lock b/yarn.lock index 025adbd14d..db245f9f9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1867,21 +1867,12 @@ __metadata: languageName: node linkType: hard -"@polkadot/api-contract-support@6.12.2-10, @polkadot/api-contract-support@workspace:packages/api-contract-support": - version: 0.0.0-use.local - resolution: "@polkadot/api-contract-support@workspace:packages/api-contract-support" - dependencies: - "@babel/runtime": ^7.16.5 - languageName: unknown - linkType: soft - "@polkadot/api-contract@workspace:packages/api-contract": version: 0.0.0-use.local resolution: "@polkadot/api-contract@workspace:packages/api-contract" dependencies: "@babel/runtime": ^7.16.5 "@polkadot/api": 6.12.2-10 - "@polkadot/api-contract-support": 6.12.2-10 "@polkadot/types": 6.12.2-10 "@polkadot/util": ^8.1.2 rxjs: ^7.4.0 @@ -2104,6 +2095,7 @@ __metadata: resolution: "@polkadot/types-codec@workspace:packages/types-codec" dependencies: "@babel/runtime": ^7.16.5 + "@polkadot/types": ^6.12.2-9 "@polkadot/util": ^8.1.2 languageName: unknown linkType: soft @@ -2137,7 +2129,7 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/types@6.12.2-10, @polkadot/types@workspace:packages/types": +"@polkadot/types@6.12.2-10, @polkadot/types@^6.12.2-9, @polkadot/types@workspace:packages/types": version: 0.0.0-use.local resolution: "@polkadot/types@workspace:packages/types" dependencies: