Align Provider type w/ other packages & re-expose

src/BaseBlockTracker.ts

@@ -1,19 +1,11 @@
 import SafeEventEmitter from '@metamask/safe-event-emitter';
-import { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
 
 const sec = 1000;
 
 const calculateSum = (accumulator: number, currentValue: number) =>
   accumulator + currentValue;
 const blockTrackerEvents: (string | symbol)[] = ['sync', 'latest'];
 
-export interface Provider extends SafeEventEmitter {
-  sendAsync: <T, U>(
-    req: JsonRpcRequest<T>,
-    cb: (err: Error, response: JsonRpcResponse<U>) => void,
-  ) => void;
-}
-
 interface BaseBlockTrackerArgs {
   blockResetDuration?: number;
 }

src/PollingBlockTracker.ts

@@ -1,8 +1,9 @@
 import getCreateRandomId from 'json-rpc-random-id';
 import pify from 'pify';
 import { JsonRpcRequest } from 'json-rpc-engine';
-import { BaseBlockTracker, Provider } from './BaseBlockTracker';
+import { BaseBlockTracker } from './BaseBlockTracker';
 import { projectLogger, createModuleLogger } from './logging-utils';
+import { Provider } from './types';
 
 const log = createModuleLogger(projectLogger, 'polling-block-tracker');
 const createRandomId = getCreateRandomId();

src/SubscribeBlockTracker.ts

@@ -1,6 +1,7 @@
 import getCreateRandomId from 'json-rpc-random-id';
 import { JsonRpcNotification, JsonRpcSuccess } from 'json-rpc-engine';
-import { BaseBlockTracker, Provider } from './BaseBlockTracker';
+import { BaseBlockTracker } from './BaseBlockTracker';
+import { Provider } from './types';
 
 const createRandomId = getCreateRandomId();
 

src/index.ts

@@ -1,2 +1,3 @@
 export * from './PollingBlockTracker';
 export * from './SubscribeBlockTracker';
+export * from './types';

src/types.ts

@@ -0,0 +1,11 @@
+import SafeEventEmitter from '@metamask/safe-event-emitter';
+import { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
+
+// This type should be compatible with the one defined in
+// `eth-json-rpc-middleware`.
+export interface Provider extends SafeEventEmitter {
+  sendAsync: <T, U>(
+    req: JsonRpcRequest<T>,
+    cb: (err: unknown, response: JsonRpcResponse<U>) => void,
+  ) => void;
+}

tests/withBlockTracker.ts

@@ -1,15 +1,13 @@
 import util from 'util';
 import SafeEventEmitter from '@metamask/safe-event-emitter';
 import { JsonRpcRequest, JsonRpcResponse } from 'json-rpc-engine';
-import { Provider } from '../src/BaseBlockTracker';
-import {
-  SubscribeBlockTracker,
-  SubscribeBlockTrackerOptions,
-} from '../src/SubscribeBlockTracker';
 import {
   PollingBlockTracker,
   PollingBlockTrackerOptions,
-} from '../src/PollingBlockTracker';
+  Provider,
+  SubscribeBlockTracker,
+  SubscribeBlockTrackerOptions,
+} from '../src';
 
 interface WithPollingBlockTrackerOptions {
   provider?: FakeProviderOptions;