Hex/JSON metadata split (#3829)

* Hex/JSON metadata split * revert import change * Adjust imports * Update tests
polkadot-js · Jul 30, 2021 · 7c4c346 · 7c4c346
1 parent beff353
commit 7c4c346
Show file tree

Hide file tree

Showing 28 changed files with 24 additions and 40 deletions.
diff --git a/packages/types/src/metadata/decorate/constants/index.spec.ts b/packages/types/src/metadata/decorate/constants/index.spec.ts
@@ -7,7 +7,7 @@ import type { Constants } from '../types';
 import { TypeRegistry } from '../../../create';
 import { Metadata } from '../../Metadata';
 import rpcMetadata from '../../static-substrate';
-import rpcMetadataV10 from '../../v10/static-substrate';
+import rpcMetadataV10 from '../../v10/hex/static-substrate';
 import { decorateConstants } from '..';
 
 function init (meta: string): [Constants, TypeRegistry] {

diff --git a/packages/types/src/metadata/static-polkadot.ts b/packages/types/src/metadata/static-polkadot.ts
@@ -1,6 +1,6 @@
 // Copyright 2017-2021 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import metadata from './v13/static-polkadot';
+import metadata from './v13/hex/static-polkadot';
 
 export default metadata;
diff --git a/packages/types/src/metadata/static-substrate.ts b/packages/types/src/metadata/static-substrate.ts
@@ -1,6 +1,6 @@
 // Copyright 2017-2021 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import metadata from './v13/static-substrate';
+import metadata from './v13/hex/static-substrate';
 
 export default metadata;
diff --git a/packages/types/src/metadata/v10/Metadata.spec.ts b/packages/types/src/metadata/v10/Metadata.spec.ts
@@ -3,10 +3,8 @@
 
 import { TypeRegistry } from '../../create';
 import { decodeLatestMeta, defaultValues, toLatest } from '../util/testUtil';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
+import substrateData from './hex/static-substrate';
+import substrateJson from './json/static-substrate.json';
 
 describe('MetadataV10 (substrate)', (): void => {
   const registry = new TypeRegistry();

diff --git a/...ypes/src/metadata/v10/static-substrate.ts → .../src/metadata/v10/hex/static-substrate.ts b/...ypes/src/metadata/v10/static-substrate.ts → .../src/metadata/v10/hex/static-substrate.ts
diff --git a/...es/src/metadata/v10/static-substrate.json → ...c/metadata/v10/json/static-substrate.json b/...es/src/metadata/v10/static-substrate.json → ...c/metadata/v10/json/static-substrate.json
diff --git a/packages/types/src/metadata/v11/Metadata.spec.ts b/packages/types/src/metadata/v11/Metadata.spec.ts
@@ -3,10 +3,8 @@
 
 import { TypeRegistry } from '../../create';
 import { decodeLatestMeta, defaultValues, toLatest } from '../util/testUtil';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
+import substrateData from './hex/static-substrate';
+import substrateJson from './json/static-substrate.json';
 
 describe('MetadataV11 (substrate)', (): void => {
   const registry = new TypeRegistry();

diff --git a/...ypes/src/metadata/v11/static-substrate.ts → .../src/metadata/v11/hex/static-substrate.ts b/...ypes/src/metadata/v11/static-substrate.ts → .../src/metadata/v11/hex/static-substrate.ts
diff --git a/...es/src/metadata/v11/static-substrate.json → ...c/metadata/v11/json/static-substrate.json b/...es/src/metadata/v11/static-substrate.json → ...c/metadata/v11/json/static-substrate.json
diff --git a/packages/types/src/metadata/v12/Metadata.spec.ts b/packages/types/src/metadata/v12/Metadata.spec.ts
@@ -3,10 +3,8 @@
 
 import { TypeRegistry } from '../../create';
 import { decodeLatestMeta, defaultValues, toLatest } from '../util/testUtil';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
+import substrateData from './hex/static-substrate';
+import substrateJson from './json/static-substrate.json';
 
 describe('MetadataV12 (substrate)', (): void => {
   const registry = new TypeRegistry();

diff --git a/...ypes/src/metadata/v12/static-substrate.ts → .../src/metadata/v12/hex/static-substrate.ts b/...ypes/src/metadata/v12/static-substrate.ts → .../src/metadata/v12/hex/static-substrate.ts
diff --git a/...es/src/metadata/v12/static-substrate.json → ...c/metadata/v12/json/static-substrate.json b/...es/src/metadata/v12/static-substrate.json → ...c/metadata/v12/json/static-substrate.json
diff --git a/packages/types/src/metadata/v13/Metadata.spec.ts b/packages/types/src/metadata/v13/Metadata.spec.ts
@@ -3,14 +3,10 @@
 
 import { TypeRegistry } from '../../create';
 import { decodeLatestMeta, defaultValues, toLatest } from '../util/testUtil';
-// eslint-disable-next-line import/no-duplicates
-import polkadotData from './static-polkadot';
-// eslint-disable-next-line import/no-duplicates
-import polkadotJson from './static-polkadot.json';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
+import polkadotData from './hex/static-polkadot';
+import substrateData from './hex/static-substrate';
+import polkadotJson from './json/static-polkadot.json';
+import substrateJson from './json/static-substrate.json';
 
 describe('MetadataV13 (substrate)', (): void => {
   const registry = new TypeRegistry();

diff --git a/...types/src/metadata/v13/static-polkadot.ts → ...s/src/metadata/v13/hex/static-polkadot.ts b/...types/src/metadata/v13/static-polkadot.ts → ...s/src/metadata/v13/hex/static-polkadot.ts
diff --git a/...ypes/src/metadata/v13/static-substrate.ts → .../src/metadata/v13/hex/static-substrate.ts b/...ypes/src/metadata/v13/static-substrate.ts → .../src/metadata/v13/hex/static-substrate.ts
diff --git a/...pes/src/metadata/v13/static-polkadot.json → ...rc/metadata/v13/json/static-polkadot.json b/...pes/src/metadata/v13/static-polkadot.json → ...rc/metadata/v13/json/static-polkadot.json
diff --git a/...es/src/metadata/v13/static-substrate.json → ...c/metadata/v13/json/static-substrate.json b/...es/src/metadata/v13/static-substrate.json → ...c/metadata/v13/json/static-substrate.json
diff --git a/packages/types/src/metadata/v14/Metadata.spec.ts b/packages/types/src/metadata/v14/Metadata.spec.ts
@@ -5,16 +5,12 @@ import type { MetadataAll } from '../../interfaces/metadata';
 
 import { TypeRegistry } from '../../create';
 import { Metadata } from '../Metadata';
-// eslint-disable-next-line import/no-duplicates
-import polkadotData from './static-polkadot';
-// eslint-disable-next-line import/no-duplicates
-import polkadotJson from './static-polkadot.json';
-import polkadotTypes from './static-polkadot-types.json';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
-import substrateTypes from './static-substrate-types.json';
+import polkadotData from './hex/static-polkadot';
+import substrateData from './hex/static-substrate';
+import polkadotJson from './json/static-polkadot.json';
+import polkadotTypes from './json/static-polkadot-types.json';
+import substrateJson from './json/static-substrate.json';
+import substrateTypes from './json/static-substrate-types.json';
 
 describe('MetadataV14 (substrate)', (): void => {
   // FIXME This is to be replaced with the proper version (here as a stop-gap)

diff --git a/...types/src/metadata/v14/static-polkadot.ts → ...s/src/metadata/v14/hex/static-polkadot.ts b/...types/src/metadata/v14/static-polkadot.ts → ...s/src/metadata/v14/hex/static-polkadot.ts
diff --git a/...ypes/src/metadata/v14/static-substrate.ts → .../src/metadata/v14/hex/static-substrate.ts b/...ypes/src/metadata/v14/static-substrate.ts → .../src/metadata/v14/hex/static-substrate.ts
diff --git a/...c/metadata/v14/static-polkadot-types.json → ...adata/v14/json/static-polkadot-types.json b/...c/metadata/v14/static-polkadot-types.json → ...adata/v14/json/static-polkadot-types.json
diff --git a/...pes/src/metadata/v14/static-polkadot.json → ...rc/metadata/v14/json/static-polkadot.json b/...pes/src/metadata/v14/static-polkadot.json → ...rc/metadata/v14/json/static-polkadot.json
diff --git a/.../metadata/v14/static-substrate-types.json → ...data/v14/json/static-substrate-types.json b/.../metadata/v14/static-substrate-types.json → ...data/v14/json/static-substrate-types.json
diff --git a/...es/src/metadata/v14/static-substrate.json → ...c/metadata/v14/json/static-substrate.json b/...es/src/metadata/v14/static-substrate.json → ...c/metadata/v14/json/static-substrate.json
@@ -4659,7 +4659,7 @@
             {
               "name": "IgnoredIssuance",
               "type": 6,
-              "value": "0x9c33ee170e636c010000000000000000",
+              "value": "0x00000000000000000000000000000000",
               "docs": [
                 " The issuance to ignore. This is subtracted from the `Currency`'s `total_issuance` to get",
                 " the issuance by which we inflate or deflate the gilt."

diff --git a/packages/types/src/metadata/v9/Metadata.spec.ts b/packages/types/src/metadata/v9/Metadata.spec.ts
@@ -3,10 +3,8 @@
 
 import { TypeRegistry } from '../../create';
 import { decodeLatestMeta, defaultValues, toLatest } from '../util/testUtil';
-// eslint-disable-next-line import/no-duplicates
-import substrateData from './static-substrate';
-// eslint-disable-next-line import/no-duplicates
-import substrateJson from './static-substrate.json';
+import substrateData from './hex/static-substrate';
+import substrateJson from './json/static-substrate.json';
 
 describe('MetadataV9 (substrate)', (): void => {
   const registry = new TypeRegistry();

diff --git a/...types/src/metadata/v9/static-substrate.ts → ...s/src/metadata/v9/hex/static-substrate.ts b/...types/src/metadata/v9/static-substrate.ts → ...s/src/metadata/v9/hex/static-substrate.ts
diff --git a/...pes/src/metadata/v9/static-substrate.json → ...rc/metadata/v9/json/static-substrate.json b/...pes/src/metadata/v9/static-substrate.json → ...rc/metadata/v9/json/static-substrate.json
diff --git a/packages/types/src/primitive/StorageKey.spec.ts b/packages/types/src/primitive/StorageKey.spec.ts
@@ -3,7 +3,7 @@
 
 import { TypeRegistry } from '../create';
 import { decorateStorage, Metadata } from '../metadata';
-import rpcDataV11 from '../metadata/v11/static-substrate';
+import rpcDataV11 from '../metadata/v11/hex/static-substrate';
 import { StorageKey } from '.';
 
 describe('StorageKey', (): void => {