Refactor helper and test

Author: david0xd

packages/snaps-jest/src/helpers.test.tsx

@@ -734,11 +734,20 @@ describe('installSnap', () => {
   describe('onKeyringRequest', () => {
     it('sends a keyring request and returns the result', async () => {
       jest.spyOn(console, 'log').mockImplementation();
+      const mockRequestObject = {
+        params: {
+          options: {
+            privateKey: 'foo bar',
+          },
+        },
+        id: 1,
+        method: 'keyring_listAccounts',
+        jsonrpc: '2.0',
+      } as const;
 
       const { snapId, close: closeServer } = await getMockServer({
         sourceCode: `
           module.exports.onKeyringRequest = async ({ origin, request }) => {
-            // return handleKeyringRequest(keyring, request);
             return request;
           }
          `,
@@ -747,24 +756,13 @@ describe('installSnap', () => {
       const { onKeyringRequest, close } = await installSnap(snapId);
       const response = await onKeyringRequest({
         origin: 'metamask.io',
-        request: {
-          params: {
-            foo: 'bar',
-          },
-        },
+        request: mockRequestObject,
       });
 
       expect(response).toStrictEqual(
         expect.objectContaining({
           response: {
-            result: {
-              id: 1,
-              jsonrpc: '2.0',
-              method: '',
-              params: {
-                foo: 'bar',
-              },
-            },
+            result: mockRequestObject,
           },
         }),
       );

packages/snaps-simulation/src/helpers.ts

@@ -233,7 +233,7 @@ export function getHelpers({
   ): Promise<SnapResponseWithInterface> => {
     log('Sending keyring request %o.', request);
 
-    const { origin: keyringRequestOrigin, ...keyringRequest } = create(
+    const { origin: keyringRequestOrigin, request: keyringRequest } = create(
       request,
       KeyringOptionsStruct,
     );
@@ -245,10 +245,7 @@ export function getHelpers({
       runSaga,
       controllerMessenger,
       handler: HandlerType.OnKeyringRequest,
-      request: {
-        method: '',
-        params: keyringRequest.request.params,
-      },
+      request: { origin: keyringRequestOrigin, ...keyringRequest },
     });
 
     assertIsResponseWithInterface(response);