refactor: rm getMetricsState createRPCMethodTrackingMiddleware param

MetaMask · Sep 9, 2024 · 2fe0a90 · 2fe0a90
1 parent ad65b1c
commit 2fe0a90
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -129,8 +129,6 @@ let globalRateLimitCount = 0;
  * signature requests
  *
  * @param {object} opts - options for the rpc method tracking middleware
- * @param {Function} opts.getMetricsState - get the state of
- *  MetaMetricsController
  * @param {number} [opts.rateLimitTimeout] - time, in milliseconds, to wait before
  *  allowing another set of events to be tracked for methods rate limited by timeout.
  * @param {number} [opts.rateLimitSamplePercent] - percentage, in decimal, of events
@@ -149,7 +147,6 @@ let globalRateLimitCount = 0;
  */
 
 export default function createRPCMethodTrackingMiddleware({
-  getMetricsState,
   rateLimitTimeout = 60 * 5 * 1000, // 5 minutes
   rateLimitSamplePercent = 0.001, // 0.1%
   globalRateLimitTimeout = 60 * 5 * 1000, // 5 minutes
@@ -197,7 +194,8 @@ export default function createRPCMethodTrackingMiddleware({
     // anything. This is extra redundancy because this value is checked in
     // the metametrics controller's trackEvent method as well.
     const userParticipatingInMetaMetrics =
-      getMetricsState().participateInMetaMetrics === true;
+      metaMetricsController.store.getMetricsState().participateInMetaMetrics ===
+      true;
 
     // Get the event type, each of which has APPROVED, REJECTED and REQUESTED
     // keys for the various events in the flow.

diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -21,7 +21,6 @@ const MOCK_ID = '123';
 const expectedUniqueIdentifier = `signature-${MOCK_ID}`;
 
 const metricsState = { participateInMetaMetrics: null };
-const getMetricsState = () => metricsState;
 
 const expectedMetametricsEventUndefinedProps = {
   actionId: undefined,
@@ -77,10 +76,10 @@ const metaMetricsController = new MetaMetricsController({
     },
   },
 });
+metaMetricsController.store.getMetricsState = () => metricsState;
 
 const createHandler = (opts) =>
   createRPCMethodTrackingMiddleware({
-    getMetricsState,
     rateLimitTimeout: 1000,
     rateLimitSamplePercent: 0.1,
     globalRateLimitTimeout: 0,

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -5452,9 +5452,6 @@ export default class MetamaskController extends EventEmitter {
 
     engine.push(
       createRPCMethodTrackingMiddleware({
-        getMetricsState: this.metaMetricsController.store.getState.bind(
-          this.metaMetricsController.store,
-        ),
         getAccountType: this.getAccountType.bind(this),
         getDeviceModel: this.getDeviceModel.bind(this),
         isConfirmationRedesignEnabled,