From 74f929c48c20c126fcbca650d061ddd81f12ebc8 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 9 Jan 2021 13:31:12 +0100 Subject: [PATCH] Swap Edgeware to specVersioned (#4353) --- packages/apps-config/package.json | 2 +- packages/apps-config/src/api/chain/beresheet.ts | 13 ------------- packages/apps-config/src/api/chain/index.ts | 2 -- packages/apps-config/src/api/index.ts | 4 ++-- packages/apps-config/src/api/spec/edgeware.ts | 13 ------------- packages/apps-config/src/api/spec/index.ts | 2 -- .../apps-config/src/api/specVersioned/edgeware.ts | 10 ++++++++++ packages/apps-config/src/api/specVersioned/index.ts | 2 ++ yarn.lock | 10 +++++----- 9 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 packages/apps-config/src/api/chain/beresheet.ts delete mode 100644 packages/apps-config/src/api/spec/edgeware.ts create mode 100644 packages/apps-config/src/api/specVersioned/edgeware.ts diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 3d81809fe2..7ccf6181c1 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -11,7 +11,7 @@ "dependencies": { "@acala-network/type-definitions": "^0.6.1", "@babel/runtime": "^7.12.5", - "@edgeware/node-types": "^3.0.11", + "@edgeware/node-types": "^3.2.0", "@interlay/polkabtc-types": "^0.2.9", "@laminar/type-definitions": "^0.2.0-beta.141", "@polkadot/networks": "^5.2.3", diff --git a/packages/apps-config/src/api/chain/beresheet.ts b/packages/apps-config/src/api/chain/beresheet.ts deleted file mode 100644 index 847941dae0..0000000000 --- a/packages/apps-config/src/api/chain/beresheet.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// structs need to be in order -/* eslint-disable sort-keys */ - -import { Beresheet } from '@edgeware/node-types'; - -export default { - ...Beresheet.types, - // Substrate overrides - RefCount: 'u32' -}; diff --git a/packages/apps-config/src/api/chain/index.ts b/packages/apps-config/src/api/chain/index.ts index c9d324da82..30df06da64 100644 --- a/packages/apps-config/src/api/chain/index.ts +++ b/packages/apps-config/src/api/chain/index.ts @@ -1,11 +1,9 @@ // Copyright 2017-2021 @polkadot/apps-config authors & contributors // SPDX-License-Identifier: Apache-2.0 -import Beresheet from './beresheet'; import Phala from './phala'; // alphabetical, based on the actual displayed name export default { - Beresheet, 'Phala PoC-3': Phala }; diff --git a/packages/apps-config/src/api/index.ts b/packages/apps-config/src/api/index.ts index 9726b51aad..a6cc590a35 100644 --- a/packages/apps-config/src/api/index.ts +++ b/packages/apps-config/src/api/index.ts @@ -10,8 +10,8 @@ export * from './params'; export function getChainTypes (specName: string, chainName: string): Record> { return { - ...(typesSpec[specName as 'edgeware'] || {}), - ...(typesChain[chainName as 'Beresheet'] || {}) + ...(typesSpec[specName as keyof typeof typesSpec] || {}), + ...(typesChain[chainName as keyof typeof typesChain] || {}) }; } diff --git a/packages/apps-config/src/api/spec/edgeware.ts b/packages/apps-config/src/api/spec/edgeware.ts deleted file mode 100644 index ec1732e5a5..0000000000 --- a/packages/apps-config/src/api/spec/edgeware.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// structs need to be in order -/* eslint-disable sort-keys */ - -import { Beresheet } from '@edgeware/node-types'; - -export default { - ...Beresheet.types, - // chain-specific overrides - RefCount: 'u32' -}; diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 38eafd5938..868b07d9bb 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -11,7 +11,6 @@ import darwinia from './darwinia'; import darwiniaParachain from './darwinia-parachain'; import dock from './dock'; import dusty from './dusty'; -import edgeware from './edgeware'; import encointerNodeNotee from './encointer-node-notee'; import encointerNodeTeeproxy from './encointer-node-teeproxy'; import equilibrium from './equilibrium'; @@ -43,7 +42,6 @@ export default { 'dock-main-runtime': dock, 'dock-testnet': dock, dusty3: dusty, - edgeware, 'encointer-node': encointerNodeNotee, 'encointer-node-notee': encointerNodeNotee, 'encointer-node-teeproxy': encointerNodeTeeproxy, diff --git a/packages/apps-config/src/api/specVersioned/edgeware.ts b/packages/apps-config/src/api/specVersioned/edgeware.ts new file mode 100644 index 0000000000..9ab6e67b98 --- /dev/null +++ b/packages/apps-config/src/api/specVersioned/edgeware.ts @@ -0,0 +1,10 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +import { spec } from '@edgeware/node-types'; + +const edgeware = spec.typesBundle.spec?.edgeware as OverrideBundleDefinition; + +export default edgeware; diff --git a/packages/apps-config/src/api/specVersioned/index.ts b/packages/apps-config/src/api/specVersioned/index.ts index dcc7e5700f..828fe6b526 100644 --- a/packages/apps-config/src/api/specVersioned/index.ts +++ b/packages/apps-config/src/api/specVersioned/index.ts @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import acala from './acala'; +import edgeware from './edgeware'; import equilibrium from './equilibrium'; import kulupu from './kulupu'; import laminar from './laminar'; @@ -13,6 +14,7 @@ export default { Equilibrium: equilibrium, acala, 'btc-parachain': polkabtc, + edgeware, kulupu, laminar, mandala: acala, diff --git a/yarn.lock b/yarn.lock index 46c8c7ae87..a355fdb781 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1391,10 +1391,10 @@ __metadata: languageName: node linkType: hard -"@edgeware/node-types@npm:^3.0.11": - version: 3.0.11 - resolution: "@edgeware/node-types@npm:3.0.11" - checksum: a98552a63dd138748c5c68ee34401e2b46b326cd5897eb001d74b1ebb4a0817a074be60cde10fd1ee0368f5923554c56476fedc96cffe3764bdc87675a7e4790 +"@edgeware/node-types@npm:^3.2.0": + version: 3.2.0 + resolution: "@edgeware/node-types@npm:3.2.0" + checksum: a5c0ff07269fd67f0d3c468426fecf00d66ba651cc77f285082945b5c894f47d50ab10488614ec0a6cf633143e7987ca1061a52657770f10cb8401e94ebb7215 languageName: node linkType: hard @@ -2185,7 +2185,7 @@ __metadata: dependencies: "@acala-network/type-definitions": ^0.6.1 "@babel/runtime": ^7.12.5 - "@edgeware/node-types": ^3.0.11 + "@edgeware/node-types": ^3.2.0 "@interlay/polkabtc-types": ^0.2.9 "@laminar/type-definitions": ^0.2.0-beta.141 "@polkadot/networks": ^5.2.3