refactor(tests): update createPregenDelegationServerReuseTest to accept parameters directly

Author: Ansonhkg

packages/e2e/src/e2e.spec.ts

@@ -272,7 +272,14 @@ describe('all', () => {
       describe('server reuse flow', () => {
         it(
           'should sign using materials shipped over the wire',
-          createPregenDelegationServerReuseTest(ctx)
+          createPregenDelegationServerReuseTest({
+            authManager: ctx.authManager,
+            authData: ctx.aliceViemAccountAuthData,
+            pkpPublicKey: ctx.aliceViemAccountPkp.pubkey,
+            clientLitClient: ctx.litClient,
+            fallbackLitClient: ctx.litClient,
+            networkName: process.env['NETWORK'] ?? 'naga-dev',
+          })
         );
       });
     });

packages/e2e/src/tests/signSessionKey/pregen-delegation.ts

@@ -6,17 +6,36 @@ import {
 } from '@lit-protocol/auth';
 import { createLitClient } from '@lit-protocol/lit-client';
 import { resolveNetworkImportName } from '../../helper/network';
-import { initFast } from '../../init';
+import { AuthData } from '@lit-protocol/schemas';
+import { AuthManagerInstance, LitClientInstance } from '../../types';
 
-type PregenContext = Awaited<ReturnType<typeof initFast>>;
+type PregenDelegationParams = {
+  authManager: AuthManagerInstance;
+  authData: AuthData;
+  pkpPublicKey: string;
+  clientLitClient: LitClientInstance;
+  fallbackLitClient?: LitClientInstance;
+  networkName?: string;
+};
 
-export const createPregenDelegationServerReuseTest = (ctx: PregenContext) => {
+export const createPregenDelegationServerReuseTest = (
+  params: PregenDelegationParams
+) => {
   return async () => {
+    const {
+      authManager,
+      authData,
+      pkpPublicKey,
+      clientLitClient,
+      fallbackLitClient,
+      networkName,
+    } = params;
+
     const sessionKeyPair = generateSessionKeyPair();
     const delegationAuthSig =
-      await ctx.authManager.generatePkpDelegationAuthSig({
-        pkpPublicKey: ctx.aliceViemAccountPkp.pubkey,
-        authData: ctx.aliceViemAccountAuthData,
+      await authManager.generatePkpDelegationAuthSig({
+        pkpPublicKey,
+        authData,
         sessionKeyPair,
         authConfig: {
           resources: [
@@ -26,11 +45,11 @@ export const createPregenDelegationServerReuseTest = (ctx: PregenContext) => {
           ],
           expiration: new Date(Date.now() + 1000 * 60 * 15).toISOString(),
         },
-        litClient: ctx.litClient,
+        litClient: clientLitClient,
       });
 
     const envelope = JSON.stringify({
-      pkpPublicKey: ctx.aliceViemAccountPkp.pubkey,
+      pkpPublicKey,
       payload: Buffer.from(
         JSON.stringify({ sessionKeyPair, delegationAuthSig }),
         'utf8'
@@ -57,7 +76,7 @@ export const createPregenDelegationServerReuseTest = (ctx: PregenContext) => {
     const serverAuthManager = createAuthManager({
       storage: storagePlugins.localStorageNode({
         appName: 'e2e-server-reuse',
-        networkName: process.env['NETWORK'] ?? 'naga-dev',
+        networkName: networkName ?? 'naga-dev',
         storagePath: './.e2e/server-reuse-storage',
       }),
     });
@@ -72,12 +91,12 @@ export const createPregenDelegationServerReuseTest = (ctx: PregenContext) => {
     let litClient;
     try {
       const networksModule = await import('@lit-protocol/networks');
-      const importName = resolveNetworkImportName(process.env['NETWORK']);
+      const importName = resolveNetworkImportName(networkName);
       const networkModule = networksModule[importName];
       litClient = await createLitClient({ network: networkModule });
       await litClient.connect();
     } catch {
-      litClient = ctx.litClient;
+      litClient = fallbackLitClient ?? clientLitClient;
     }
 
     const result = await litClient.chain.ethereum.pkpSign({

packages/e2e/src/tickets/jss36-pregen-delegation.spec.ts

@@ -9,6 +9,13 @@ describe('PKP Auth with Pre-generated Materials', () => {
   });
 
   test('Try to pregen', async () => {
-    await createPregenDelegationServerReuseTest(ctx)();
+    await createPregenDelegationServerReuseTest({
+      authManager: ctx.authManager,
+      authData: ctx.aliceViemAccountAuthData,
+      pkpPublicKey: ctx.aliceViemAccountPkp.pubkey,
+      clientLitClient: ctx.litClient,
+      fallbackLitClient: ctx.litClient,
+      networkName: process.env['NETWORK'] ?? 'naga-dev',
+    })();
   });
 });