Fix all unit tests

zkemail · Sep 22, 2024 · 7ab2036 · 7ab2036
1 parent 1e94cc1
commit 7ab2036
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/EmailRecoveryManager.sol b/src/EmailRecoveryManager.sol
@@ -119,6 +119,9 @@ abstract contract EmailRecoveryManager is
         view
         returns (uint256)
     {
+        if(!recoveryRequests[account].recoveryDataHashWeight.contains(recoveryDataHash)) {
+            return 0;
+        }
         return recoveryRequests[account].recoveryDataHashWeight.get(recoveryDataHash);
     }
 
@@ -487,7 +490,7 @@ abstract contract EmailRecoveryManager is
         if (recoveryRequests[msg.sender].executeBefore == 0) {
             revert NoRecoveryInProcess();
         }
-        delete recoveryRequests[msg.sender];
+        clearRecoveryRequest(msg.sender);
         emit RecoveryCancelled(msg.sender);
     }
 
@@ -506,7 +509,7 @@ abstract contract EmailRecoveryManager is
                 account, block.timestamp, recoveryRequests[account].executeBefore
             );
         }
-        delete recoveryRequests[account];
+        clearRecoveryRequest(account);
         emit RecoveryCancelled(account);
     }
 

diff --git a/.../OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol b/.../OwnableValidatorRecovery/UniversalEmailRecoveryModule/UniversalEmailRecoveryModule.t.sol
@@ -408,9 +408,7 @@ contract OwnableValidatorRecovery_UniversalEmailRecoveryModule_Integration_Test
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                IEmailRecoveryManager.InvalidRecoveryDataHash.selector,
-                validator2RecoveryDataHash,
-                recoveryDataHash1
+                IEmailRecoveryManager.GuardianAlreadyVoted.selector
             )
         );
         // process recovery for validator 2

diff --git a/test/unit/EmailRecoveryManager/completeRecovery.t.sol b/test/unit/EmailRecoveryManager/completeRecovery.t.sol
@@ -106,9 +106,9 @@ contract EmailRecoveryManager_completeRecovery_Test is UnitBase {
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                IEmailRecoveryManager.InvalidRecoveryDataHash.selector,
-                keccak256(invalidRecoveryData),
-                recoveryDataHash
+                IEmailRecoveryManager.NotEnoughApprovals.selector,
+                0,
+                3
             )
         );
         emailRecoveryModule.completeRecovery(accountAddress1, invalidRecoveryData);

diff --git a/test/unit/EmailRecoveryManager/processRecovery.t.sol b/test/unit/EmailRecoveryManager/processRecovery.t.sol
@@ -125,9 +125,7 @@ contract EmailRecoveryManager_processRecovery_Test is UnitBase {
 
         vm.expectRevert(
             abi.encodeWithSelector(
-                IEmailRecoveryManager.InvalidRecoveryDataHash.selector,
-                invalidRecoveryDataHash,
-                recoveryDataHash
+                IEmailRecoveryManager.GuardianAlreadyVoted.selector
             )
         );
         emailRecoveryModule.exposed_processRecovery(