Remove duplicate tests

zkemail · Aug 1, 2024 · acbb7f6 · acbb7f6
1 parent 76f7fb3
commit acbb7f6
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 261 deletions.
diff --git a/test/unit/EmailRecoveryManager/addGuardian.t.sol b/test/unit/EmailRecoveryManager/addGuardian.t.sol
diff --git a/test/unit/EmailRecoveryManager/changeThreshold.t.sol b/test/unit/EmailRecoveryManager/changeThreshold.t.sol
diff --git a/test/unit/EmailRecoveryManager/removeGuardian.t.sol b/test/unit/EmailRecoveryManager/removeGuardian.t.sol
diff --git a/test/unit/EmailRecoveryManager/setupGuardians.t.sol b/test/unit/EmailRecoveryManager/setupGuardians.t.sol
diff --git a/...libraries/GuardianUtils/addGuardian.t.sol → test/unit/GuardianManager/addGuardian.t.sol b/...libraries/GuardianUtils/addGuardian.t.sol → test/unit/GuardianManager/addGuardian.t.sol
@@ -4,17 +4,38 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { UnitBase } from "../../UnitBase.t.sol";
+import { UnitBase } from "../UnitBase.t.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 
-contract GuardianUtils_addGuardian_Test is UnitBase {
+contract GuardianManager_addGuardian_Test is UnitBase {
     using ModuleKitHelpers for *;
 
     function setUp() public override {
         super.setUp();
     }
 
+    function test_AddGuardian_RevertWhen_AlreadyRecovering() public {
+        acceptGuardian(accountSalt1);
+        acceptGuardian(accountSalt2);
+        vm.warp(12 seconds);
+        handleRecovery(recoveryModuleAddress, calldataHash, accountSalt1);
+
+        vm.startPrank(accountAddress);
+        vm.expectRevert(IGuardianManager.RecoveryInProcess.selector);
+        emailRecoveryModule.addGuardian(guardians[0], guardianWeights[0]);
+    }
+
+    function test_AddGuardian_RevertWhen_SetupNotCalled() public {
+        vm.prank(accountAddress);
+        instance.uninstallModule(MODULE_TYPE_EXECUTOR, recoveryModuleAddress, "");
+        vm.stopPrank();
+
+        vm.startPrank(accountAddress);
+        vm.expectRevert(IGuardianManager.SetupNotCalled.selector);
+        emailRecoveryModule.addGuardian(guardians[0], guardianWeights[0]);
+    }
+
     function test_AddGuardian_RevertWhen_InvalidGuardianAddress() public {
         address invalidGuardianAddress = address(0);
 

diff --git a/...aries/GuardianUtils/changeThreshold.t.sol → ...nit/GuardianManager/changeThreshold.t.sol b/...aries/GuardianUtils/changeThreshold.t.sol → ...nit/GuardianManager/changeThreshold.t.sol
@@ -2,14 +2,25 @@
 pragma solidity ^0.8.25;
 
 import { console2 } from "forge-std/console2.sol";
-import { UnitBase } from "../../UnitBase.t.sol";
+import { UnitBase } from "../UnitBase.t.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 
-contract GuardianUtils_changeThreshold_Test is UnitBase {
+contract GuardianManager_changeThreshold_Test is UnitBase {
     function setUp() public override {
         super.setUp();
     }
 
+    function test_RevertWhen_AlreadyRecovering() public {
+        acceptGuardian(accountSalt1);
+        acceptGuardian(accountSalt2);
+        vm.warp(12 seconds);
+        handleRecovery(recoveryModuleAddress, calldataHash, accountSalt1);
+
+        vm.startPrank(accountAddress);
+        vm.expectRevert(IGuardianManager.RecoveryInProcess.selector);
+        emailRecoveryModule.changeThreshold(threshold);
+    }
+
     function test_RevertWhen_SetupNotCalled() public {
         vm.expectRevert(IGuardianManager.SetupNotCalled.selector);
         emailRecoveryModule.changeThreshold(threshold);

diff --git a/...it/EmailRecoveryManager/getGuardian.t.sol → test/unit/GuardianManager/getGuardian.t.sol b/...it/EmailRecoveryManager/getGuardian.t.sol → test/unit/GuardianManager/getGuardian.t.sol
@@ -5,7 +5,7 @@ import { console2 } from "forge-std/console2.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { UnitBase } from "../UnitBase.t.sol";
 
-contract EmailRecoveryManager_getGuardian_Test is UnitBase {
+contract GuardianManager_getGuardian_Test is UnitBase {
     address newGuardian = address(1);
     uint256 newGuardianWeight = 1;
 

diff --git a/...ilRecoveryManager/getGuardianConfig.t.sol → ...t/GuardianManager/getGuardianConfig.t.sol b/...ilRecoveryManager/getGuardianConfig.t.sol → ...t/GuardianManager/getGuardianConfig.t.sol
diff --git a/...es/GuardianUtils/removeAllGuardians.t.sol → .../GuardianManager/removeAllGuardians.t.sol b/...es/GuardianUtils/removeAllGuardians.t.sol → .../GuardianManager/removeAllGuardians.t.sol
@@ -2,14 +2,14 @@
 pragma solidity ^0.8.25;
 
 import { console2 } from "forge-std/console2.sol";
-import { UnitBase } from "../../UnitBase.t.sol";
+import { UnitBase } from "../UnitBase.t.sol";
 import {
     EnumerableGuardianMap,
     GuardianStorage,
     GuardianStatus
 } from "src/libraries/EnumerableGuardianMap.sol";
 
-contract GuardianUtils_removeAllGuardians_Test is UnitBase {
+contract GuardianManager_removeAllGuardians_Test is UnitBase {
     function setUp() public override {
         super.setUp();
     }

diff --git a/...raries/GuardianUtils/removeGuardian.t.sol → ...unit/GuardianManager/removeGuardian.t.sol b/...raries/GuardianUtils/removeGuardian.t.sol → ...unit/GuardianManager/removeGuardian.t.sol
@@ -3,15 +3,28 @@ pragma solidity ^0.8.25;
 
 import { console2 } from "forge-std/console2.sol";
 
-import { UnitBase } from "../../UnitBase.t.sol";
+import { UnitBase } from "../UnitBase.t.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 
-contract GuardianUtils_removeGuardian_Test is UnitBase {
+contract GuardianManager_removeGuardian_Test is UnitBase {
     function setUp() public override {
         super.setUp();
     }
 
+    function test_RemoveGuardian_RevertWhen_AlreadyRecovering() public {
+        address guardian = guardian1;
+
+        acceptGuardian(accountSalt1);
+        acceptGuardian(accountSalt2);
+        vm.warp(12 seconds);
+        handleRecovery(recoveryModuleAddress, calldataHash, accountSalt1);
+
+        vm.startPrank(accountAddress);
+        vm.expectRevert(IGuardianManager.RecoveryInProcess.selector);
+        emailRecoveryModule.removeGuardian(guardian);
+    }
+
     function test_RemoveGuardian_RevertWhen_AddressNotGuardianForAccount() public {
         address unauthorizedAccount = guardian1;
 
@@ -54,6 +67,8 @@ contract GuardianUtils_removeGuardian_Test is UnitBase {
         // (weight < threshold == 3 < 3) = succeeds
 
         vm.startPrank(accountAddress);
+        vm.expectEmit();
+        emit IGuardianManager.RemovedGuardian(accountAddress, guardian, guardianWeights[0]);
         emailRecoveryModule.removeGuardian(guardian);
 
         GuardianStorage memory guardianStorage =
@@ -65,7 +80,8 @@ contract GuardianUtils_removeGuardian_Test is UnitBase {
             emailRecoveryModule.getGuardianConfig(accountAddress);
         assertEq(guardianConfig.guardianCount, guardians.length - 1);
         assertEq(guardianConfig.totalWeight, totalWeight - guardianWeights[0]);
-        assertEq(guardianConfig.acceptedWeight, 0);
+
+        assertEq(guardianConfig.acceptedWeight, 0); // 1 - 1 = 0
         assertEq(guardianConfig.threshold, threshold);
     }
 

diff --git a/...raries/GuardianUtils/setupGuardians.t.sol → ...unit/GuardianManager/setupGuardians.t.sol b/...raries/GuardianUtils/setupGuardians.t.sol → ...unit/GuardianManager/setupGuardians.t.sol
@@ -4,11 +4,11 @@ pragma solidity ^0.8.25;
 import { console2 } from "forge-std/console2.sol";
 import { ModuleKitHelpers } from "modulekit/ModuleKit.sol";
 import { MODULE_TYPE_EXECUTOR } from "modulekit/external/ERC7579.sol";
-import { UnitBase } from "../../UnitBase.t.sol";
+import { UnitBase } from "../UnitBase.t.sol";
 import { GuardianStorage, GuardianStatus } from "src/libraries/EnumerableGuardianMap.sol";
 import { IGuardianManager } from "src/interfaces/IGuardianManager.sol";
 
-contract GuardianUtils_setupGuardians_Test is UnitBase {
+contract GuardianManager_setupGuardians_Test is UnitBase {
     using ModuleKitHelpers for *;
 
     function setUp() public override {