Merge pull request #160 from paritytech/e2e-fixtures

chore: modernize e2e fixture registration

Author: charlesHetterich

e2e/cli/fixtures/registry.ts

@@ -19,50 +19,27 @@
  * Queries the on-chain playground registry to verify deploy outcomes.
  */
 
-import { ContractManager } from "@parity/product-sdk-contracts";
-import { createDevSigner, getDevPublicKey } from "@parity/product-sdk-tx";
-import { ss58Encode } from "@parity/product-sdk-address";
 import { getTestClient } from "../helpers/chain.js";
-import {
-	PLAYGROUND_REGISTRY_CONTRACT,
-	suppressReviveTraceNoise,
-	withRequiredLiveContractAddresses,
-} from "../../../src/utils/contractManifest.js";
+import { getReadOnlyRegistryContract } from "../../../src/utils/registry.js";
 import { resolveSigner } from "../../../src/utils/signer.js";
 import { publishToPlayground } from "../../../src/utils/deploy/playground.js";
 import { SIGNER } from "./accounts.js";
 
-import cdmJson from "../../../cdm.json";
-
 export interface AppEntry {
 	domain: string;
 	owner: string;
 	metadataUri: string;
 }
 
-type Registry = Awaited<ReturnType<Awaited<ReturnType<typeof ContractManager.fromClient>>["getContract"]>>;
+type Registry = Awaited<ReturnType<typeof getReadOnlyRegistryContract>>;
 
 let registryPromise: Promise<Registry> | null = null;
 
 async function getRegistry(): Promise<Registry> {
 	if (!registryPromise) {
 		registryPromise = (async () => {
 			const client = await getTestClient();
-			const aliceSigner = createDevSigner("Alice");
-			const aliceAddress = ss58Encode(getDevPublicKey("Alice"));
-			// Mirror src/utils/registry.ts — query the CDM meta-registry for the
-			// live address before binding, so the helper reads from the same
-			// contract `dot mod` and `dot deploy` actually use. Without this,
-			// reads land on the cdm.json snapshot and silently diverge from the
-			// command paths after a registry redeploy. See issue #74.
-			const manifest = await withRequiredLiveContractAddresses(cdmJson, client.raw.assetHub, [
-				PLAYGROUND_REGISTRY_CONTRACT,
-			]);
-			const manager = await ContractManager.fromClient(manifest, client.raw.assetHub, {
-				defaultSigner: aliceSigner,
-				defaultOrigin: aliceAddress,
-			});
-			return suppressReviveTraceNoise(manager.getContract(PLAYGROUND_REGISTRY_CONTRACT));
+			return getReadOnlyRegistryContract(client.raw.assetHub);
 		})().catch((err) => {
 			// Reset so the next call can retry instead of replaying the error
 			registryPromise = null;

e2e/cli/setup/fund.ts

@@ -30,6 +30,11 @@ import { checkBalance, ensureFunded } from "../../../src/utils/account/funding.j
 import { getTestClient } from "../helpers/chain.js";
 import { SIGNER } from "../fixtures/accounts.js";
 
+interface FundedAccount {
+	name: string;
+	address: string;
+}
+
 const PAS = 10_000_000_000n;
 
 /** Top up the deployer if it falls below this. */
@@ -38,18 +43,22 @@ export const MIN_BALANCE = 500n * PAS;
 /** Amount to send when topping up. */
 export const TOP_UP_AMOUNT = 1000n * PAS;
 
-export async function fundDeployerIfLow(): Promise<void> {
+export async function fundAccountIfLow(account: FundedAccount): Promise<void> {
 	const client = await getTestClient();
-	const before = await checkBalance(client, SIGNER.address, MIN_BALANCE);
+	const before = await checkBalance(client, account.address, MIN_BALANCE);
 	console.log(
-		`[e2e setup] SIGNER (${SIGNER.name}) balance: ${before.free / PAS} PAS (${SIGNER.address})`,
+		`[e2e setup] ${account.name} balance: ${before.free / PAS} PAS (${account.address})`,
 	);
 	if (before.sufficient) return;
 
 	console.log(
 		`[e2e setup] balance below ${MIN_BALANCE / PAS} PAS — topping up by ${TOP_UP_AMOUNT / PAS} PAS…`,
 	);
-	await ensureFunded(client, SIGNER.address, MIN_BALANCE, TOP_UP_AMOUNT);
-	const after = await checkBalance(client, SIGNER.address, MIN_BALANCE);
-	console.log(`[e2e setup] SIGNER topped up: ${after.free / PAS} PAS`);
+	await ensureFunded(client, account.address, MIN_BALANCE, TOP_UP_AMOUNT);
+	const after = await checkBalance(client, account.address, MIN_BALANCE);
+	console.log(`[e2e setup] ${account.name} topped up: ${after.free / PAS} PAS`);
+}
+
+export async function fundDeployerIfLow(): Promise<void> {
+	await fundAccountIfLow(SIGNER);
 }

package.json

@@ -43,7 +43,7 @@
         "bulletin-deploy": "0.7.20-rc.4",
         "commander": "^12.0.0",
         "ink": "^5.2.1",
-        "polkadot-api": "^2.1.2",
+        "polkadot-api": "^2.1.3",
         "react": "^18.3.1",
         "react-devtools-core": "file:stubs/react-devtools-core",
         "tar": "^7.5.13"