Remove usage of PromiseOrValue

AngelProtocolFinance · Aug 3, 2023 · ec51517 · ec51517
1 parent 146122c
commit ec51517
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/test/core/accounts/AccountsUpdateEndowments.ts b/test/core/accounts/AccountsUpdateEndowments.ts
@@ -12,7 +12,6 @@ import {
   Registrar__factory,
   TestFacetProxyContract,
 } from "typechain-types";
-import {PromiseOrValue} from "typechain-types/common";
 import {AccountMessages} from "typechain-types/contracts/core/accounts/facets/AccountsUpdateEndowments";
 import {
   AccountStorage,
@@ -240,7 +239,7 @@ describe("AccountsUpdateEndowments", function () {
       });
 
       async function expectNothingChanged(
-        endowId: PromiseOrValue<BigNumberish>,
+        endowId: BigNumberish,
         oldEndow: AccountStorage.EndowmentStruct
       ) {
         const updated = await state.getEndowmentDetails(endowId);

diff --git a/test/core/accounts/utils/updateSettings.ts b/test/core/accounts/utils/updateSettings.ts
@@ -1,5 +1,4 @@
 import {BigNumberish} from "ethers";
-import {PromiseOrValue} from "typechain-types/common";
 import {
   AccountStorage,
   LibAccounts,
@@ -15,7 +14,7 @@ import {DeepPartial} from "utils/types";
  * @returns the updated endowment
  */
 export async function updateSettings(
-  endowId: PromiseOrValue<BigNumberish>,
+  endowId: BigNumberish,
   field: keyof LibAccounts.SettingsControllerStruct,
   settings: DeepPartial<LibAccounts.SettingsPermissionStruct>,
   state: TestFacetProxyContract
@@ -41,7 +40,7 @@ export async function updateSettings(
  * @returns the updated endowment data with all settings updated
  */
 export async function updateAllSettings(
-  endowId: PromiseOrValue<BigNumberish>,
+  endowId: BigNumberish,
   settings: DeepPartial<LibAccounts.SettingsPermissionStruct>,
   state: TestFacetProxyContract
 ) {
@@ -51,7 +50,7 @@ export async function updateAllSettings(
   lockedEndow.settingsController = (
     Object.entries(lockedEndow.settingsController) as [
       keyof LibAccounts.SettingsControllerStruct,
-      LibAccounts.SettingsPermissionStruct,
+      LibAccounts.SettingsPermissionStruct
     ][]
   ).reduce((controller, [key, curSetting]) => {
     controller[key] = getUpdated(curSetting, settings);

diff --git a/utils/types/common.ts b/utils/types/common.ts
@@ -1,13 +1,12 @@
 import {Overrides} from "ethers";
-import {PromiseOrValue} from "typechain-types/common";
 
 export type DeepPartial<T> = {
   [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
 
 type Head<T extends any[]> = Required<T> extends [
   ...infer Head,
-  Overrides & {from?: PromiseOrValue<string>},
+  Overrides & {from?: string},
 ]
   ? Head
   : never;