Update test imports

zkemail · Jun 17, 2024 · 8613324 · 8613324
1 parent bd3573a
commit 8613324
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 55 deletions.
diff --git a/test/unit/EmailRecoveryManager/acceptGuardian.t.sol b/test/unit/EmailRecoveryManager/acceptGuardian.t.sol
@@ -2,13 +2,10 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 contract ZkEmailRecovery_acceptGuardian_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/EmailRecoveryManager/addGuardian.t.sol b/test/unit/EmailRecoveryManager/addGuardian.t.sol
@@ -2,13 +2,9 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
-import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 error SetupNotCalled();
 error InvalidGuardianAddress();

diff --git a/test/unit/EmailRecoveryManager/cancelRecovery.t.sol b/test/unit/EmailRecoveryManager/cancelRecovery.t.sol
@@ -2,12 +2,9 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 contract ZkEmailRecovery_cancelRecovery_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/EmailRecoveryManager/changeThreshold.t.sol b/test/unit/EmailRecoveryManager/changeThreshold.t.sol
@@ -2,12 +2,9 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 error SetupNotCalled();
 error ThresholdCannotExceedTotalWeight();

diff --git a/test/unit/EmailRecoveryManager/completeRecovery.t.sol b/test/unit/EmailRecoveryManager/completeRecovery.t.sol
@@ -2,13 +2,10 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 // completeRecovery(accountAddress, recoveryCalldata)
 contract ZkEmailRecovery_completeRecovery_Test is UnitBase {

diff --git a/test/unit/EmailRecoveryManager/configureRecovery.t.sol b/test/unit/EmailRecoveryManager/configureRecovery.t.sol
@@ -2,15 +2,11 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 error SetupAlreadyCalled();
 

diff --git a/test/unit/EmailRecoveryManager/constructor.t.sol b/test/unit/EmailRecoveryManager/constructor.t.sol
@@ -14,13 +14,13 @@ contract ZkEmailRecovery_constructor_Test is UnitBase {
     function test_Constructor() public {
         EmailRecoveryManager emailRecoveryManager = new EmailRecoveryManager(
             address(verifier),
-            address(ecdsaOwnedDkimRegistry),
+            address(dkimRegistry),
             address(emailAuthImpl),
             address(emailRecoveryHandler)
         );
 
         assertEq(address(verifier), emailRecoveryManager.verifier());
-        assertEq(address(ecdsaOwnedDkimRegistry), emailRecoveryManager.dkim());
+        assertEq(address(dkimRegistry), emailRecoveryManager.dkim());
         assertEq(address(emailAuthImpl), emailRecoveryManager.emailAuthImplementation());
     }
 }
diff --git a/test/unit/EmailRecoveryManager/deInitRecoveryFromModule.t.sol b/test/unit/EmailRecoveryManager/deInitRecoveryFromModule.t.sol
@@ -2,14 +2,11 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 contract ZkEmailRecovery_deInitRecoveryFromModule_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/EmailRecoveryManager/processRecovery.t.sol b/test/unit/EmailRecoveryManager/processRecovery.t.sol
@@ -2,13 +2,10 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 
 contract ZkEmailRecovery_processRecovery_Test is UnitBase {

diff --git a/test/unit/EmailRecoveryManager/removeGuardian.t.sol b/test/unit/EmailRecoveryManager/removeGuardian.t.sol
@@ -2,13 +2,10 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 
 error ThresholdCannotExceedTotalWeight();

diff --git a/test/unit/EmailRecoveryManager/updateRecoveryConfig.t.sol b/test/unit/EmailRecoveryManager/updateRecoveryConfig.t.sol
@@ -2,13 +2,10 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 import { UnitBase } from "../UnitBase.t.sol";
 import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-import { OwnableValidator } from "src/test/OwnableValidator.sol";
 
 contract ZkEmailRecovery_updateRecoveryConfig_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/EmailRecoveryManager/validateAcceptanceSubjectTemplates.t.sol b/test/unit/EmailRecoveryManager/validateAcceptanceSubjectTemplates.t.sol
@@ -2,12 +2,9 @@
 pragma solidity ^0.8.25;
 
 // import "forge-std/console2.sol";
-// import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-// import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 // import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 // import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-// import { OwnableValidator } from "src/test/OwnableValidator.sol";
 // import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 // import { UnitBase } from "../UnitBase.t.sol";
 

diff --git a/test/unit/EmailRecoveryManager/validateRecoverySubjectTemplates.t.sol b/test/unit/EmailRecoveryManager/validateRecoverySubjectTemplates.t.sol
@@ -2,12 +2,9 @@
 pragma solidity ^0.8.25;
 
 // import "forge-std/console2.sol";
-// import { ModuleKitHelpers, ModuleKitUserOp } from "modulekit/ModuleKit.sol";
-// import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 
 // import { IEmailRecoveryManager } from "src/interfaces/IEmailRecoveryManager.sol";
 // import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
-// import { OwnableValidator } from "src/test/OwnableValidator.sol";
 // import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 // import { UnitBase } from "../UnitBase.t.sol";
 

diff --git a/test/unit/UnitBase.t.sol b/test/unit/UnitBase.t.sol
@@ -3,8 +3,13 @@ pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
 import { Test } from "forge-std/Test.sol";
-
-import { RhinestoneModuleKit, AccountInstance } from "modulekit/ModuleKit.sol";
+import {
+    RhinestoneModuleKit,
+    AccountInstance,
+    ModuleKitHelpers,
+    ModuleKitUserOp
+} from "modulekit/ModuleKit.sol";
+import { MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR } from "modulekit/external/ERC7579.sol";
 import { ECDSAOwnedDKIMRegistry } from
     "ether-email-auth/packages/contracts/src/utils/ECDSAOwnedDKIMRegistry.sol";
 import {
@@ -17,9 +22,13 @@ import { ECDSA } from "solady/utils/ECDSA.sol";
 import { EmailRecoveryManagerHarness } from "./EmailRecoveryManagerHarness.sol";
 import { EmailRecoverySubjectHandler } from "src/handlers/EmailRecoverySubjectHandler.sol";
 import { EmailRecoveryModule } from "src/modules/EmailRecoveryModule.sol";
+import { OwnableValidator } from "src/test/OwnableValidator.sol";
 import { MockGroth16Verifier } from "src/test/MockGroth16Verifier.sol";
 
 abstract contract UnitBase is RhinestoneModuleKit, Test {
+    using ModuleKitHelpers for *;
+    using ModuleKitUserOp for *;
+
     // ZK Email contracts and variables
     address zkEmailDeployer = vm.addr(1);
     ECDSAOwnedDKIMRegistry dkimRegistry;

diff --git a/test/unit/libraries/EnumerableGuardianMap/get.t.sol b/test/unit/libraries/EnumerableGuardianMap/get.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EnumerableGuardianMap_get_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/libraries/EnumerableGuardianMap/keys.t.sol b/test/unit/libraries/EnumerableGuardianMap/keys.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EnumerableGuardianMap_keys_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/libraries/EnumerableGuardianMap/remove.t.sol b/test/unit/libraries/EnumerableGuardianMap/remove.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EnumerableGuardianMap_remove_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/libraries/EnumerableGuardianMap/removeAll.t.sol b/test/unit/libraries/EnumerableGuardianMap/removeAll.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EnumerableGuardianMap_removeAll_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/libraries/EnumerableGuardianMap/set.t.sol b/test/unit/libraries/EnumerableGuardianMap/set.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EnumerableGuardianMap_set_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/getPreviousOwnerInLinkedList.t.sol b/test/unit/modules/EmailRecoveryModule/getPreviousOwnerInLinkedList.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_getPreviousOwnerInLinkedList_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/isInitialized.t.sol b/test/unit/modules/EmailRecoveryModule/isInitialized.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_isInitialized_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/isModuleType.t.sol b/test/unit/modules/EmailRecoveryModule/isModuleType.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_isModuleType_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/name.t.sol b/test/unit/modules/EmailRecoveryModule/name.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_name_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/onInstall.t.sol b/test/unit/modules/EmailRecoveryModule/onInstall.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_onInstall_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/onUninstall.t.sol b/test/unit/modules/EmailRecoveryModule/onUninstall.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_onUninstall_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/recover.t.sol b/test/unit/modules/EmailRecoveryModule/recover.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_recover_Test is UnitBase {
     function setUp() public override {

diff --git a/test/unit/modules/EmailRecoveryModule/version.t.sol b/test/unit/modules/EmailRecoveryModule/version.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.25;
 
 import "forge-std/console2.sol";
-import { UnitBase } from "../UnitBase.t.sol";
+import { UnitBase } from "../../UnitBase.t.sol";
 
 contract EmailRecoveryModule_version_Test is UnitBase {
     function setUp() public override {