test(wallet): add tests for AccountsController and ConnectivityController initialization

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: grypez

packages/wallet/src/Wallet.test.ts

@@ -1,10 +1,14 @@
+import { CONNECTIVITY_STATUSES } from '@metamask/connectivity-controller';
 import { Messenger } from '@metamask/messenger';
 import { Json } from '@metamask/utils';
 import { webcrypto } from 'crypto';
 
 import MockEncryptor from '../../keyring-controller/tests/mocks/mockEncryptor';
 import * as initializationModule from './initialization/initialization';
-import { importSecretRecoveryPhrase } from './utilities';
+import {
+  createSecretRecoveryPhrase,
+  importSecretRecoveryPhrase,
+} from './utilities';
 import { Wallet } from './Wallet';
 
 const TEST_SRP = 'test test test test test test test test test test test ball';
@@ -176,6 +180,34 @@ describe('Wallet', () => {
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
+  describe('AccountsController', () => {
+    it('tracks accounts created via KeyringController', async () => {
+      const wallet = new Wallet({});
+      await createSecretRecoveryPhrase(wallet, TEST_PASSWORD);
+
+      const keyringAccounts = await wallet.messenger.call(
+        'KeyringController:getAccounts',
+      );
+      const trackedAddresses = Object.values(
+        wallet.state.AccountsController.internalAccounts.accounts,
+      ).map((account) => account.address);
+
+      expect(trackedAddresses).toStrictEqual(keyringAccounts);
+    });
+  });
+
+  describe('ConnectivityController', () => {
+    it('reports online connectivity status', async () => {
+      const wallet = new Wallet({});
+
+      await new Promise<void>((resolve) => process.nextTick(resolve));
+
+      expect(wallet.state.ConnectivityController.connectivityStatus).toBe(
+        CONNECTIVITY_STATUSES.Online,
+      );
+    });
+  });
+
   describe('KeyringController', () => {
     it('can unlock and populate accounts', async () => {
       const wallet = await setupWallet();

packages/wallet/src/initialization/instances/accounts-controller.ts

@@ -1,6 +1,7 @@
 import {
   AccountsController,
   AccountsControllerMessenger,
+  AccountsControllerState,
 } from '@metamask/accounts-controller';
 import {
   Messenger,
@@ -26,7 +27,7 @@ export const accountsController: InitializationConfiguration<
   name: 'AccountsController',
   init: ({ state, messenger }) =>
     new AccountsController({
-      state,
+      state: (state ?? {}) as AccountsControllerState,
       messenger,
     }),
   getMessenger: (parent: RootMessenger<DefaultActions, DefaultEvents>) => {

packages/wallet/src/initialization/instances/connectivity-controller.test.ts

@@ -0,0 +1,51 @@
+import { CONNECTIVITY_STATUSES } from '@metamask/connectivity-controller';
+import { Messenger } from '@metamask/messenger';
+
+import {
+  AlwaysOnlineAdapter,
+  connectivityController,
+} from './connectivity-controller';
+
+describe('AlwaysOnlineAdapter', () => {
+  it('returns Online from getStatus', async () => {
+    const adapter = new AlwaysOnlineAdapter();
+    const status = await adapter.getStatus();
+
+    expect(status).toBe(CONNECTIVITY_STATUSES.Online);
+  });
+
+  it('onConnectivityChange is a no-op', () => {
+    const adapter = new AlwaysOnlineAdapter();
+    const callback = jest.fn();
+
+    adapter.onConnectivityChange(callback);
+
+    expect(callback).not.toHaveBeenCalled();
+  });
+
+  it('destroy is a no-op', () => {
+    const adapter = new AlwaysOnlineAdapter();
+
+    expect(() => adapter.destroy()).not.toThrow();
+  });
+});
+
+describe('connectivityController', () => {
+  it('reports online status after initialization', async () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const parent = new Messenger<'Root', any, any>({ namespace: 'Root' });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const messenger = connectivityController.getMessenger(parent as any);
+    const controller = connectivityController.init({
+      messenger,
+      state: undefined,
+      options: {},
+    });
+
+    await controller.init();
+
+    expect(controller.state.connectivityStatus).toBe(
+      CONNECTIVITY_STATUSES.Online,
+    );
+  });
+});

packages/wallet/src/initialization/instances/connectivity-controller.ts

@@ -11,7 +11,7 @@ import type { DefaultActions, DefaultEvents, RootMessenger } from '../defaults';
 import type { InitializationConfiguration } from '../types';
 
 // TODO: For now, we assume we are always online.
-class AlwaysOnlineAdapter implements ConnectivityAdapter {
+export class AlwaysOnlineAdapter implements ConnectivityAdapter {
   async getStatus(): Promise<ConnectivityStatus> {
     return CONNECTIVITY_STATUSES.Online;
   }

packages/wallet/src/utilities.test.ts

@@ -0,0 +1,31 @@
+import { webcrypto } from 'crypto';
+
+import { createSecretRecoveryPhrase } from './utilities';
+import { Wallet } from './Wallet';
+
+const TEST_PASSWORD = 'testpass';
+
+describe('createSecretRecoveryPhrase', () => {
+  beforeAll(() => {
+    // We can remove this once we drop Node 18
+    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+    globalThis.crypto ??= webcrypto as typeof globalThis.crypto;
+
+    // eslint-disable-next-line no-restricted-syntax
+    if (!('CryptoKey' in globalThis)) {
+      Object.defineProperty(globalThis, 'CryptoKey', {
+        value: webcrypto.CryptoKey,
+      });
+    }
+  });
+
+  it('creates a vault and populates accounts', async () => {
+    const wallet = new Wallet({});
+
+    await createSecretRecoveryPhrase(wallet, TEST_PASSWORD);
+
+    expect(
+      await wallet.messenger.call('KeyringController:getAccounts'),
+    ).toHaveLength(1);
+  });
+});

packages/wallet/tsconfig.build.json

@@ -6,7 +6,9 @@
     "rootDir": "./src"
   },
   "references": [
+    { "path": "../accounts-controller/tsconfig.build.json" },
     { "path": "../base-controller/tsconfig.build.json" },
+    { "path": "../connectivity-controller/tsconfig.build.json" },
     { "path": "../keyring-controller/tsconfig.build.json" },
     { "path": "../messenger/tsconfig.build.json" }
   ],