further validation flow tests, add helper

contracts/smart-account/modules/AccountRecoveryModule.sol

@@ -11,7 +11,7 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
  *         - It allows to _______________
  *         - ECDSA guardians only
  *         - For security reasons guardian address is not stored,
- *           instead its signature over CONTROL_HASH is used as 
+ *           instead its signature over CONTROL_HASH is used as
  *
  *
  * @author Fil Makarov - <[email protected]>
@@ -184,11 +184,12 @@ contract AccountRecoveryModule is BaseAuthorizationModule {
             .recoveryThreshold;
         if (requiredSignatures == 0)
             revert ThresholdNotSetForSmartAccount(userOp.sender);
+
         (bytes memory signatures, ) = abi.decode(
             userOp.signature,
             (bytes, address)
         );
-        if (signatures.length < requiredSignatures * 65)
+        if (signatures.length < requiredSignatures * 2*65)
             revert InvalidSignaturesLength();
 
         address lastGuardianAddress;
@@ -218,8 +219,12 @@ contract AccountRecoveryModule is BaseAuthorizationModule {
                 return SIG_VALIDATION_FAILED;
             }
 
-            validAfter = _guardians[keccak256(currentGuardianSig)][userOp.sender].validAfter;
-            validUntil = _guardians[keccak256(currentGuardianSig)][userOp.sender].validUntil;
+            validAfter = _guardians[keccak256(currentGuardianSig)][
+                userOp.sender
+            ].validAfter;
+            validUntil = _guardians[keccak256(currentGuardianSig)][
+                userOp.sender
+            ].validUntil;
 
             // 0,0 means the `currentGuardian` has not been set as guardian for the userOp.sender smartAccount
             if (validUntil == 0 && validAfter == 0) {
@@ -335,8 +340,7 @@ contract AccountRecoveryModule is BaseAuthorizationModule {
         uint48 validUntil,
         uint48 validAfter
     ) external {
-        if (guardian == newGuardian)
-            revert GuardiansAreIdentical();
+        if (guardian == newGuardian) revert GuardiansAreIdentical();
         if (guardian == bytes32(0)) revert ZeroGuardian();
         if (newGuardian == bytes32(0)) revert ZeroGuardian();
 

test/bundler-integration/module/AccountRecovery.Module.specs.ts

@@ -169,9 +169,9 @@ describe("Account Recovery Module (via Bundler)", async () => {
     }
   );
 
-  const delay = async function(ms: number) : Promise<void> {
+  const delay = async function (ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
-  }
+  };
 
   it("Can submit a recovery request and execute it after a proper delay", async () => {
     const {
@@ -248,7 +248,10 @@ describe("Account Recovery Module (via Bundler)", async () => {
     // await ethers.provider.send("evm_mine", []);
 
     // USING THIS HACK INSTEAD
-    console.log("Waiting for the security delay of %i seconds to pass...", defaultSecurityDelay + 1);
+    console.log(
+      "Waiting for the security delay of %i seconds to pass...",
+      defaultSecurityDelay + 1
+    );
     await delay((defaultSecurityDelay + 1) * 1000);
 
     // can be non signed at all, just needs to be executed after the delay
@@ -281,6 +284,5 @@ describe("Account Recovery Module (via Bundler)", async () => {
     expect(await ecdsaModule.getOwner(userSA.address)).to.not.equal(
       smartAccountOwner.address
     );
-
   });
 });