fix: onRetryFunction

src/block-ref.test.ts

@@ -116,7 +116,6 @@ describe('createBlockRefMiddleware', () => {
                   id: 1,
                   jsonrpc: '2.0',
                   result: 'something',
-                  error: undefined,
                 });
               },
             );
@@ -209,7 +208,6 @@ describe('createBlockRefMiddleware', () => {
                   id: 1,
                   jsonrpc: '2.0',
                   result: 'something',
-                  error: undefined,
                 });
               },
             );

src/block-ref.ts

@@ -2,6 +2,7 @@ import type { PollingBlockTracker } from '@metamask/eth-block-tracker';
 import type { SafeEventEmitterProvider } from '@metamask/eth-json-rpc-provider';
 import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';
 import { createAsyncMiddleware } from '@metamask/json-rpc-engine';
+import { serializeError } from '@metamask/rpc-errors';
 import type { Json, JsonRpcParams } from '@metamask/utils';
 import { klona } from 'klona/full';
 
@@ -69,10 +70,8 @@ export function createBlockRefMiddleware({
         childRequest,
       );
       res.result = childResult;
-      res.error = undefined;
-    } catch (error: any) {
-      res.result = undefined;
-      res.error = error;
+    } catch (error) {
+      res.error = serializeError(error);
     }
 
     return undefined;

src/retryOnEmpty.test.ts

@@ -162,7 +162,6 @@ describe('createRetryOnEmptyMiddleware', () => {
                 id: 1,
                 jsonrpc: '2.0',
                 result: 'something',
-                error: undefined,
               });
             },
           );

src/retryOnEmpty.ts

@@ -98,39 +98,34 @@ export function createRetryOnEmptyMiddleware({
     // create child request with specific block-ref
     const childRequest = klona(req);
     // attempt child request until non-empty response is received
-    try {
-      const childResult = await retry(10, async () => {
-        log('Performing request %o', childRequest);
-        const result = await provider.request<JsonRpcParams, Block>(
-          childRequest,
+    const childResult = await retry(10, async () => {
+      log('Performing request %o', childRequest);
+      const attemptResult = await provider.request<JsonRpcParams, Block>(
+        childRequest,
+      );
+      log('Result is %o', attemptResult);
+      // verify result
+      const allEmptyValues: unknown[] = emptyValues;
+      if (allEmptyValues.includes(attemptResult)) {
+        throw new Error(
+          `RetryOnEmptyMiddleware - empty result "${JSON.stringify(
+            attemptResult,
+          )}" for request "${JSON.stringify(childRequest)}"`,
         );
-        log('Result is %o', result);
-        // verify result
-        if (emptyValues.includes(result as any)) {
-          throw new Error(
-            `RetryOnEmptyMiddleware - empty result "${JSON.stringify(
-              result,
-            )}" for request "${JSON.stringify(childRequest)}"`,
-          );
-        }
-        return result;
-      });
-      log('Copying result %o', childResult);
-      res.result = childResult;
-      res.error = undefined;
-    } catch (error: any) {
-      log('Copying error %o', error);
-      res.result = undefined;
-      res.error = error;
-    }
+      }
+      return attemptResult;
+    });
+    log('Copying result %o', childResult);
+    // copy child result onto original response
+    res.result = childResult;
     return undefined;
   });
 }
 
-async function retry(
+async function retry<Response>(
   maxRetries: number,
-  asyncFn: () => Promise<Block>,
-): Promise<Block> {
+  asyncFn: () => Promise<Response>,
+): Promise<Response> {
   for (let index = 0; index < maxRetries; index++) {
     try {
       return await asyncFn();