From 87b886ad64f95fe1fa1938a2a5d767189e4b9e15 Mon Sep 17 00:00:00 2001 From: Fahrrader Date: Tue, 06 Jun 2023 10:32:05 +0000 Subject: [PATCH] refactor(zombienet): superuser const + transfer dump ownership to UniqueNetwork --- --- a/tests/package.json +++ b/tests/package.json @@ -13,8 +13,8 @@ "@types/node": "^20.2.3", "@typescript-eslint/eslint-plugin": "^5.47.0", "@typescript-eslint/parser": "^5.47.0", - "@zombienet/orchestrator": "https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c", - "@zombienet/utils": "https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c", + "@zombienet/orchestrator": "https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c", + "@zombienet/utils": "https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c", "chai": "^4.3.6", "chai-subset": "^1.6.0", "eslint": "^8.25.0", --- a/tests/src/util/frankenstein.ts +++ b/tests/src/util/frankenstein.ts @@ -32,6 +32,7 @@ const NEW_PARA_BIN = process.env.NEW_PARA_BIN; const NEW_PARA_WASM = process.env.NEW_PARA_WASM; const PARACHAIN_BLOCK_TIME = 12_000; +const SUPERUSER_KEY = '//Alice'; let network: zombie.Network | undefined; @@ -84,7 +85,7 @@ // Enable or disable maintenance mode if present on the chain async function toggleMaintenanceMode(value: boolean, wsUri: string) { await usingPlaygrounds(async (helper, privateKey) => { - const superuser = await privateKey('//Alice'); + const superuser = await privateKey(SUPERUSER_KEY); try { const toggle = value ? 'enable' : 'disable'; await helper.getSudo().executeExtrinsic(superuser, `api.tx.maintenance.${toggle}`, []); @@ -198,7 +199,7 @@ // Read the new WASM code and set it as the relay's new code const code = fs.readFileSync(NEW_RELAY_WASM).toString('hex'); await usingPlaygrounds(async (helper, privateKey) => { - const superuser = await privateKey('//Alice'); + const superuser = await privateKey(SUPERUSER_KEY); const result = await helper.executeExtrinsic( superuser, @@ -255,7 +256,7 @@ const code = fs.readFileSync(NEW_PARA_WASM); const codeHash = blake2AsHex(code); await usingPlaygrounds(async (helper, privateKey) => { - const superuser = await privateKey('//Alice'); + const superuser = await privateKey(SUPERUSER_KEY); upgradingParas[paraId] = {version: getSpecVersion(helper.getApi()), upgraded: false}; --- a/tests/yarn.lock +++ b/tests/yarn.lock @@ -1162,9 +1162,9 @@ "@typescript-eslint/types" "5.59.6" eslint-visitor-keys "^3.3.0" -"@zombienet/orchestrator@https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c": +"@zombienet/orchestrator@https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c": version "0.0.41" - resolved "https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c#41f589f64638aad0ea9ec6519b4a0be1214d3e91" + resolved "https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/orchestrator?767fa6226b7f6a43d674063d63c5bc505db1253c#41f589f64638aad0ea9ec6519b4a0be1214d3e91" dependencies: "@polkadot/api" "^10.7.1" "@polkadot/keyring" "^12.1.2" @@ -1198,9 +1198,9 @@ toml "^3.0.0" ts-node "^10.9.1" -"@zombienet/utils@https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c": +"@zombienet/utils@https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c": version "0.0.20" - resolved "https://gitpkg.now.sh/Fahrrader/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c#e0ae62f61a115cc036c1168ae175622726d0fdbf" + resolved "https://gitpkg.now.sh/UniqueNetwork/zombienet/javascript/packages/utils?767fa6226b7f6a43d674063d63c5bc505db1253c#e0ae62f61a115cc036c1168ae175622726d0fdbf" dependencies: cli-table3 "^0.6.2" debug "^4.3.4" -- gitstuff