lint and fix commented tests

polkadot-js · Oct 3, 2024 · d47183a · d47183a
1 parent 833b8f2
commit d47183a
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 33 deletions.
diff --git a/packages/types-known/src/upgrades/e2e/kusama.ts b/packages/types-known/src/upgrades/e2e/kusama.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2024 @polkadot/types-known authors & contributors
- // SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 
- // Auto-generated from on-chain data & manual definitions, do not edit
- /* eslint-disable quotes, comma-spacing */
+// Auto-generated from on-chain data & manual definitions, do not edit
+/* eslint-disable quotes, comma-spacing */
 
- import type { ChainUpgradesExpanded } from '../types.js';
+import type { ChainUpgradesExpanded } from '../types.js';
 
- export const upgrades: ChainUpgradesExpanded = [
+export const upgrades: ChainUpgradesExpanded = [
  [
  0,
  1020,
@@ -5370,4 +5370,3 @@
  ]
  ]
 ];
-
diff --git a/packages/types-known/src/upgrades/e2e/polkadot.ts b/packages/types-known/src/upgrades/e2e/polkadot.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2024 @polkadot/types-known authors & contributors
- // SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 
- // Auto-generated from on-chain data & manual definitions, do not edit
- /* eslint-disable quotes, comma-spacing */
+// Auto-generated from on-chain data & manual definitions, do not edit
+/* eslint-disable quotes, comma-spacing */
 
- import type { ChainUpgradesExpanded } from '../types.js';
+import type { ChainUpgradesExpanded } from '../types.js';
 
- export const upgrades: ChainUpgradesExpanded = [
+export const upgrades: ChainUpgradesExpanded = [
  [
  0,
  0,
@@ -3710,4 +3710,3 @@
  ]
  ]
 ];
-
diff --git a/packages/types-known/src/upgrades/e2e/westend.ts b/packages/types-known/src/upgrades/e2e/westend.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2024 @polkadot/types-known authors & contributors
- // SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 
- // Auto-generated from on-chain data & manual definitions, do not edit
- /* eslint-disable quotes, comma-spacing */
+// Auto-generated from on-chain data & manual definitions, do not edit
+/* eslint-disable quotes, comma-spacing */
 
- import type { ChainUpgradesExpanded } from '../types.js';
+import type { ChainUpgradesExpanded } from '../types.js';
 
- export const upgrades: ChainUpgradesExpanded = [
+export const upgrades: ChainUpgradesExpanded = [
  [
  214356,
  4,
@@ -5954,4 +5954,3 @@
  ]
  ]
 ];
-
diff --git a/packages/types/src/metadata/Metadata.spec.ts b/packages/types/src/metadata/Metadata.spec.ts
@@ -5,6 +5,9 @@
 
 import type { HexString } from '@polkadot/util/types';
 
+import kusamaV14 from '@polkadot/types-support/metadata/static-kusama';
+import polkadotV14 from '@polkadot/types-support/metadata/static-polkadot';
+import substrateV14 from '@polkadot/types-support/metadata/static-substrate';
 import kusama from '@polkadot/types-support/metadata/v15/kusama-hex';
 import polkadot from '@polkadot/types-support/metadata/v15/polkadot-hex';
 import substrate from '@polkadot/types-support/metadata/v15/substrate-hex';
@@ -18,6 +21,12 @@ const allData: Record<string, HexString> = {
  substrate
 };
 
+const allDataV14: Record<string, HexString> = {
+ kusamaV14,
+ polkadotV14,
+ substrateV14
+};
+
 for (const type of ['kusama', 'polkadot', 'substrate'] as const) {
  describe(`${type}metadata`, (): void => {
  const registry = new TypeRegistry();
@@ -30,18 +39,19 @@ for (const type of ['kusama', 'polkadot', 'substrate'] as const) {
  ).toEqual(metadata.toJSON());
  });
 
- // it('has a sane toCallsOnly', (): void => {
- // const test = metadata.asCallsOnly;
+ it('has a sane toCallsOnly V14 only', (): void => {
+ const metadata = new Metadata(new TypeRegistry(), allDataV14[type]);
+ const test = metadata.asCallsOnly;
 
- //  // it has a useful length
- //  expect(
- //  test.toU8a().length > 65536
- //  ).toBe(true);
+ // it has a useful length
+ expect(
+ test.toU8a().length > 65536
+ ).toBe(true);
 
- //  // it sets it to the correct version
- //  expect(
- //  test.version
- //  ).toEqual(14);
- // });
+ // it sets it to the correct version
+ expect(
+ test.version
+ ).toEqual(14);
+ });
  });
 }
diff --git a/packages/types/src/metadata/util/testUtil.ts b/packages/types/src/metadata/util/testUtil.ts
@@ -6,9 +6,9 @@
 /* global describe, it, expect */
 
 import type { Registry } from '@polkadot/types-codec/types';
+import type { HexString } from '@polkadot/util/types';
 import type { MetaVersionAll } from '../versions.js';
 import type { Check } from './types.js';
-import type { HexString } from '@polkadot/util/types';
 
 import fs from 'node:fs';
 
@@ -51,21 +51,24 @@ function readJson <T = unknown> (version: number, type: string, sub: 'json' | 't
  ) as unknown as T;
 }
 
-function handleMetadata(registry: Registry, version: MetaVersionAll, data: HexString): Metadata {
+function handleMetadata (registry: Registry, version: MetaVersionAll, data: HexString): Metadata {
  let metadata: Metadata;
+
  if (version > 15) {
  const opaqueMetadata = registry.createType('Option<OpaqueMetadata>', registry.createType('Raw', data).toU8a()).unwrap();
+
  metadata = new Metadata(registry, opaqueMetadata.toHex());
  } else {
  try {
  metadata = new Metadata(registry, data);
  } catch {
  const opaqueMetadata = registry.createType('Option<OpaqueMetadata>', registry.createType('Raw', data).toU8a()).unwrap();
+
  metadata = new Metadata(registry, opaqueMetadata.toHex());
  }
  }
 
- return metadata
+ return metadata;
 }
 
 /** @internal */

diff --git a/scripts/metadata-get.mjs b/scripts/metadata-get.mjs
@@ -27,7 +27,7 @@ async function get (method, params = []) {
  id: ++requestId,
  jsonrpc: '2.0',
  method,
- params,
+ params
  }),
  headers: {
  Accept: 'application/json',