Revert "test: add Solana Websocket server by default in all our e2e (#36165)"

This reverts commit 5cfb23e.

Author: xavier-brochard

test/e2e/helpers.js

@@ -128,7 +128,10 @@ async function withFixtures(options, testSuite) {
     ethConversionInUsd,
     monConversionInUsd,
     manifestFlags,
-    solanaWebSocketSpecificMocks = [],
+    withSolanaWebSocket = {
+      server: false,
+      mocks: [],
+    },
   } = options;
 
   // Normalize localNodeOptions
@@ -155,7 +158,7 @@ async function withFixtures(options, testSuite) {
   let localNode;
   const localNodes = [];
 
-  let webSocketServer;
+  let localWebSocketServer;
 
   try {
     // Start servers based on the localNodes array
@@ -261,10 +264,11 @@ async function withFixtures(options, testSuite) {
       }
     }
 
-    // Start WebSocket server and apply Solana mocks (defaults + overrides)
-    webSocketServer = LocalWebSocketServer.getServerInstance();
-    webSocketServer.start();
-    await setupSolanaWebsocketMocks(solanaWebSocketSpecificMocks);
+    if (withSolanaWebSocket.server) {
+      localWebSocketServer = LocalWebSocketServer.getServerInstance();
+      localWebSocketServer.start();
+      await setupSolanaWebsocketMocks(withSolanaWebSocket.mocks);
+    }
 
     const { mockedEndpoint, getPrivacyReport } = await setupMocking(
       mockServer,
@@ -274,6 +278,7 @@ async function withFixtures(options, testSuite) {
         ethConversionInUsd,
         monConversionInUsd,
       },
+      withSolanaWebSocket,
     );
     if ((await detectPort(8000)) !== 8000) {
       throw new Error(
@@ -450,20 +455,9 @@ async function withFixtures(options, testSuite) {
         })(),
       );
 
-      shutdownTasks.push(
-        (async () => {
-          try {
-            if (
-              webSocketServer &&
-              typeof webSocketServer.stopAndCleanup === 'function'
-            ) {
-              await webSocketServer.stopAndCleanup();
-            }
-          } catch (e) {
-            console.log('WebSocket server already stopped or not initialized');
-          }
-        })(),
-      );
+      if (withSolanaWebSocket.server) {
+        shutdownTasks.push(localWebSocketServer.stopAndCleanup());
+      }
 
       const results = await Promise.allSettled(shutdownTasks);
       const failures = results.filter((result) => result.status === 'rejected');

test/e2e/mock-e2e.js

@@ -143,12 +143,14 @@ const privateHostMatchers = [
  * @param {object} options - Network mock options.
  * @param {string} options.chainId - The chain ID used by the default configured network.
  * @param {string} options.ethConversionInUsd - The USD conversion rate for ETH.
+ * @param {object} withSolanaWebSocket - Solana WebSocket configuration with server flag and mocks function
  * @returns {Promise<SetupMockReturn>}
  */
 async function setupMocking(
   server,
   testSpecificMock,
   { chainId, ethConversionInUsd = 1700 },
+  withSolanaWebSocket,
 ) {
   const privacyReport = new Set();
   await server.forAnyRequest().thenPassThrough({
@@ -944,12 +946,14 @@ async function setupMocking(
    * Solana Websocket
    * Setup HTTP intercept for WebSocket handshake requests
    */
-  await server
-    .forAnyWebSocket()
-    .matching((req) =>
-      /^wss:\/\/solana-(mainnet|devnet)\.infura\.io\//u.test(req.url),
-    )
-    .thenForwardTo('ws://localhost:8088');
+  if (withSolanaWebSocket.server) {
+    await server
+      .forAnyWebSocket()
+      .matching((req) =>
+        /^wss:\/\/solana-(mainnet|devnet)\.infura\.io\//u.test(req.url),
+      )
+      .thenForwardTo('ws://localhost:8088');
+  }
 
   // Test Dapp Styles
   const TEST_DAPP_STYLES_1 = fs.readFileSync(TEST_DAPP_STYLES_1_PATH);

test/e2e/tests/solana/common-solana.ts

@@ -11,6 +11,7 @@ import { ACCOUNT_TYPE } from '../../constants';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import { mockProtocolSnap } from '../../mock-response-data/snaps/snap-binary-mocks';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
+import { DEFAULT_SOLANA_WS_MOCKS } from './mocks/websocketDefaultMocks';
 
 const SOLANA_URL_REGEX_MAINNET =
   /^https:\/\/solana-(mainnet|devnet)\.infura\.io\/v3*/u;
@@ -1611,6 +1612,10 @@ export async function withSolanaAccountSnap(
       fixtures: fixtures.build(),
       title,
       dapp: true,
+      withSolanaWebSocket: {
+        server: true,
+        mocks: DEFAULT_SOLANA_WS_MOCKS,
+      },
       manifestFlags: {
         // This flag is used to enable/disable the remote mode for the carousel
         // component, which will impact to the slides count.

test/e2e/tests/solana/web-socket-connection.spec.ts

@@ -8,13 +8,18 @@ import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import AccountListPage from '../../page-objects/pages/account-list-page';
 import FixtureBuilder from '../../fixture-builder';
 import LocalWebSocketServer from '../../websocket-server';
+import { DEFAULT_SOLANA_WS_MOCKS } from './mocks/websocketDefaultMocks';
 
 describe('Solana Web Socket', function (this: Suite) {
   it('a websocket connection is open when MetaMask full view is open', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder().build(),
         title: this.test?.fullTitle(),
+        withSolanaWebSocket: {
+          server: true,
+          mocks: DEFAULT_SOLANA_WS_MOCKS,
+        },
         manifestFlags: {
           remoteFeatureFlags: {
             addSolanaAccount: true,
@@ -49,6 +54,10 @@ describe('Solana Web Socket', function (this: Suite) {
       {
         fixtures: new FixtureBuilder().build(),
         title: this.test?.fullTitle(),
+        withSolanaWebSocket: {
+          server: true,
+          mocks: DEFAULT_SOLANA_WS_MOCKS,
+        },
         manifestFlags: {
           remoteFeatureFlags: {
             addSolanaAccount: true,
@@ -93,6 +102,10 @@ describe('Solana Web Socket', function (this: Suite) {
       {
         fixtures: new FixtureBuilder().build(),
         title: this.test?.fullTitle(),
+        withSolanaWebSocket: {
+          server: true,
+          mocks: DEFAULT_SOLANA_WS_MOCKS,
+        },
         manifestFlags: {
           remoteFeatureFlags: {
             addSolanaAccount: true,

test/e2e/websocket-solana-mocks.ts

@@ -1,10 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-shadow
 import { WebSocket } from 'ws';
 import LocalWebSocketServer from './websocket-server';
-import {
-  WebSocketMessageMock,
-  DEFAULT_SOLANA_WS_MOCKS,
-} from './tests/solana/mocks/websocketDefaultMocks';
+import { WebSocketMessageMock } from './tests/solana/mocks/websocketDefaultMocks';
 
 /**
  * Sets up Solana WebSocket mocks with configurable message handlers
@@ -17,11 +14,6 @@ export async function setupSolanaWebsocketMocks(
   const localWebSocketServer = LocalWebSocketServer.getServerInstance();
   const wsServer = localWebSocketServer.getServer();
 
-  const mergedMocks: WebSocketMessageMock[] = [
-    ...mocks,
-    ...DEFAULT_SOLANA_WS_MOCKS,
-  ];
-
   // Add Solana-specific message handlers to the existing server
   wsServer.on('connection', (socket: WebSocket) => {
     console.log('Client connected to the local WebSocket server');
@@ -32,7 +24,7 @@ export async function setupSolanaWebsocketMocks(
       console.log('Message received from client:', message);
 
       // Check each mock configuration
-      for (const mock of mergedMocks) {
+      for (const mock of mocks) {
         const includes = Array.isArray(mock.messageIncludes)
           ? mock.messageIncludes
           : [mock.messageIncludes];