refactor: revert class split

packages/keyring-internal-snap-client/src/KeyringInternalSnapClient.ts

@@ -4,13 +4,75 @@ import type {
   KeyringResponseV1,
 } from '@metamask/keyring-internal-api';
 import { SubmitRequestResponseV1Struct } from '@metamask/keyring-internal-api';
+import type { Sender } from '@metamask/keyring-snap-client';
 import { KeyringClient } from '@metamask/keyring-snap-client';
 import { strictMask } from '@metamask/keyring-utils';
-import type { SnapId } from '@metamask/snaps-sdk';
+import type { Messenger } from '@metamask/messenger';
+import type { HandleSnapRequest } from '@metamask/snaps-controllers';
+import type { JsonRpcRequest, SnapId } from '@metamask/snaps-sdk';
 import type { HandlerType } from '@metamask/snaps-utils';
+import type { Json } from '@metamask/utils';
 
-import type { KeyringInternalSnapClientMessenger } from './KeyringInternalSnapClientMessenger';
-import { SnapControllerMessengerSender } from './SnapControllerMessengerSender';
+// We only need to dispatch Snap request to the Snaps controller for now.
+type AllowedActions = HandleSnapRequest;
+
+/**
+ * A restricted-`Messenger` used by `KeyringInternalSnapClient` to dispatch
+ * internal Snap requests.
+ */
+export type KeyringInternalSnapClientMessenger = Messenger<
+  'KeyringInternalSnapClient',
+  AllowedActions
+>;
+
+/**
+ * Implementation of the `Sender` interface that can be used to send requests
+ * to a Snap through a `Messenger`.
+ */
+export class SnapControllerMessengerSender implements Sender {
+  readonly #snapId: SnapId;
+
+  readonly #origin: string;
+
+  readonly #messenger: KeyringInternalSnapClientMessenger;
+
+  readonly #handler: HandlerType;
+
+  /**
+   * Create a new instance of `SnapControllerSender`.
+   *
+   * @param messenger - The `Messenger` instance used when dispatching controllers actions.
+   * @param snapId - The ID of the Snap to use.
+   * @param origin - The sender's origin.
+   * @param handler - The handler type.
+   */
+  constructor(
+    messenger: KeyringInternalSnapClientMessenger,
+    snapId: SnapId,
+    origin: string,
+    handler: HandlerType,
+  ) {
+    this.#messenger = messenger;
+    this.#snapId = snapId;
+    this.#origin = origin;
+    this.#handler = handler;
+  }
+
+  /**
+   * Send a request to the Snap and return the response.
+   *
+   * @param request - JSON-RPC request to send to the Snap.
+   * @returns A promise that resolves to the response of the request.
+   */
+  async send(request: JsonRpcRequest): Promise<Json> {
+    return this.#messenger.call('SnapController:handleRequest', {
+      snapId: this.#snapId,
+      origin: this.#origin,
+      handler: this.#handler,
+      request,
+    }) as Promise<Json>;
+  }
+}
 
 /**
  * A `KeyringClient` that allows the communication with a Snap through a

packages/keyring-internal-snap-client/src/v2/KeyringInternalSnapClientV2.test.ts

@@ -2,7 +2,7 @@ import { KeyringRpcV2Method, type KeyringAccount } from '@metamask/keyring-api';
 import type { SnapId } from '@metamask/snaps-sdk';
 
 import { KeyringInternalSnapClientV2 } from './KeyringInternalSnapClientV2';
-import type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClientMessenger';
+import type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClient';
 
 const MOCK_ACCOUNT: KeyringAccount = {
   id: '13f94041-6ae6-451f-a0fe-afdd2fda18a7',

packages/keyring-internal-snap-client/src/v2/KeyringInternalSnapClientV2.ts

@@ -2,8 +2,8 @@ import { KeyringClientV2 } from '@metamask/keyring-snap-client';
 import type { SnapId } from '@metamask/snaps-sdk';
 import type { HandlerType } from '@metamask/snaps-utils';
 
-import type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClientMessenger';
-import { SnapControllerMessengerSender } from '../SnapControllerMessengerSender';
+import type { KeyringInternalSnapClientMessenger } from '../KeyringInternalSnapClient';
+import { SnapControllerMessengerSender } from '../KeyringInternalSnapClient';
 
 /**
  * A `KeyringClient` that allows the communication with a Snap through a