fix: Dimitrios saves the day

Author: FUDCo

packages/extension/test/e2e/object-registry.test.ts

@@ -73,12 +73,11 @@ test.describe('Object Registry', () => {
     await clearLogsButton.click();
     await popupPage.click('button:text("Object Registry")');
     await expect(
-      popupPage.locator('text=Alice (v1) - 3 objects, 3 promises'),
+      popupPage.locator('text=Alice (v1) - 5 objects, 4 promises'),
     ).toBeVisible();
     const targetSelect = popupPage.locator('[data-testid="message-target"]');
     await expect(targetSelect).toBeVisible();
     const options = targetSelect.locator('option:not([value=""])');
-    console.log('options', options);
     await expect(options).toHaveCount(await options.count());
     expect(await options.count()).toBeGreaterThan(0);
     await targetSelect.selectOption({ index: 1 });
@@ -103,7 +102,7 @@ test.describe('Object Registry', () => {
     await expect(messageResponse).toContainText('"body":"#\\"vat Alice got');
     await expect(messageResponse).toContainText('"slots":[');
     await expect(
-      popupPage.locator('text=Alice (v1) - 3 objects, 5 promises'),
+      popupPage.locator('text=Alice (v1) - 5 objects, 6 promises'),
     ).toBeVisible();
   });
 

packages/extension/test/helpers/extension.ts

@@ -66,16 +66,5 @@ export const makeLoadExtension = async (): Promise<{
   // Wait for the default subcluster accordion to be visible
   await expect(popupPage.locator('text=Subcluster s1 - 3 Vats')).toBeVisible();
 
-  // Wait for the extension to setup and validate the UI is ready
-  const subcluster = popupPage.locator(
-    '[data-testid="subcluster-accordion-s1"]',
-  );
-  await expect(subcluster).toBeVisible({ timeout: 30000 });
-  await popupPage.locator('.accordion-header').first().click();
-  await expect(popupPage.locator('table tr')).toHaveCount(4, {
-    timeout: 30000,
-  });
-  await popupPage.locator('.accordion-header').first().click();
-
   return { browserContext, extensionId, popupPage };
 };

packages/kernel-browser-runtime/src/PlatformServicesClient.test.ts

@@ -2,8 +2,8 @@ import { delay, stringify } from '@metamask/kernel-utils';
 import { Logger } from '@metamask/logger';
 import type { VatId, VatConfig } from '@metamask/ocap-kernel';
 import { rpcErrors } from '@metamask/rpc-errors';
-import type { PostMessageTarget } from '@metamask/streams/browser';
 import type { JsonRpcResponse } from '@metamask/utils';
+import { makeMockMessageTarget } from '@ocap/test-utils';
 import { TestDuplexStream } from '@ocap/test-utils/streams';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
@@ -65,11 +65,7 @@ describe('PlatformServicesClient', () => {
   });
 
   it('constructs using static factory method', async () => {
-    const client = await PlatformServicesClient.make({
-      postMessage: vi.fn(),
-      addEventListener: vi.fn(),
-      removeEventListener: vi.fn(),
-    } as unknown as PostMessageTarget);
+    const client = await PlatformServicesClient.make(makeMockMessageTarget());
     expect(client).toBeDefined();
     expect(client).toBeInstanceOf(PlatformServicesClient);
   });

packages/kernel-browser-runtime/src/PlatformServicesServer.test.ts

@@ -6,8 +6,8 @@ import { delay } from '@metamask/kernel-utils';
 import { Logger } from '@metamask/logger';
 import type { VatConfig, VatId } from '@metamask/ocap-kernel';
 import { rpcErrors } from '@metamask/rpc-errors';
-import type { PostMessageTarget } from '@metamask/streams/browser';
 import type { JsonRpcRequest } from '@metamask/utils';
+import { makeMockMessageTarget } from '@ocap/test-utils';
 import { TestDuplexStream } from '@ocap/test-utils/streams';
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import type { Mock } from 'vitest';
@@ -93,11 +93,7 @@ describe('PlatformServicesServer', () => {
 
   it('constructs using static factory method', async () => {
     const server = await PlatformServicesServer.make(
-      {
-        postMessage: vi.fn(),
-        addEventListener: vi.fn(),
-        removeEventListener: vi.fn(),
-      } as unknown as PostMessageTarget,
+      makeMockMessageTarget(),
       () => ({}) as unknown as VatWorker,
     );
     expect(server).toBeDefined();

packages/kernel-rpc-methods/src/RpcClient.ts

@@ -143,7 +143,7 @@ export class RpcClient<
     });
 
     await this.#sendMessage(payload);
-    return await promise;
+    return promise;
   }
 
   /**

packages/ocap-kernel/src/Kernel.ts

@@ -130,6 +130,10 @@ export class Kernel {
     this.#platformServices = platformServices;
     this.#logger = options.logger ?? new Logger('ocap-kernel');
     this.#kernelStore = makeKernelStore(kernelDatabase);
+    if (!this.#kernelStore.kv.get('initialized')) {
+      this.#kernelStore.kv.set('initialized', 'true');
+    }
+
     if (options.resetStorage) {
       this.#resetKernelState();
     }

packages/ocap-kernel/src/store/index.ts

@@ -154,10 +154,6 @@ export function makeKernelStore(kdb: KernelDatabase, logger?: Logger) {
   const crank = getCrankMethods(context, kdb);
   const subclusters = getSubclusterMethods(context);
 
-  if (!kv.get('initialized')) {
-    kv.set('initialized', 'true');
-  }
-
   /**
    * Create a new VatStore for a vat.
    *