From d488ce891354335080d824ab2cd2588cb9689b0d Mon Sep 17 00:00:00 2001
From: Jongsun Suh <jongsun.suh@icloud.com>
Date: Wed, 17 Jul 2024 16:53:11 -0400
Subject: [PATCH] Apply `ExtractAvailable{Action,Event}` test utility types

---
 .../src/AssetsContractController.test.ts      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/assets-controllers/src/AssetsContractController.test.ts b/packages/assets-controllers/src/AssetsContractController.test.ts
index a1a943e50e8..277405bbec6 100644
--- a/packages/assets-controllers/src/AssetsContractController.test.ts
+++ b/packages/assets-controllers/src/AssetsContractController.test.ts
@@ -23,13 +23,12 @@ import { getDefaultPreferencesState } from '@metamask/preferences-controller';
 import assert from 'assert';
 
 import { mockNetwork } from '../../../tests/mock-network';
-import { buildInfuraNetworkClientConfiguration } from '../../network-controller/tests/helpers';
 import type {
-  AssetsContractControllerActions,
-  AssetsContractControllerEvents,
-  AllowedActions as AssetsContractAllowedActions,
-  AllowedEvents as AssetsContractAllowedEvents,
-} from './AssetsContractController';
+  ExtractAvailableAction,
+  ExtractAvailableEvent,
+} from '../../base-controller/tests/helpers';
+import { buildInfuraNetworkClientConfiguration } from '../../network-controller/tests/helpers';
+import type { AssetsContractControllerMessenger } from './AssetsContractController';
 import {
   AssetsContractController,
   MISSING_PROVIDER_ERROR,
@@ -80,12 +79,10 @@ async function setupAssetContractControllers({
   let provider: Provider;
 
   const controllerMessenger = new ControllerMessenger<
-    | NetworkControllerActions
-    | AssetsContractControllerActions
-    | AssetsContractAllowedActions,
+    | ExtractAvailableAction<AssetsContractControllerMessenger>
+    | NetworkControllerActions,
+    | ExtractAvailableEvent<AssetsContractControllerMessenger>
     | NetworkControllerEvents
-    | AssetsContractControllerEvents
-    | AssetsContractAllowedEvents
   >();
   const networkController = new NetworkController({
     infuraProjectId,