cleanup tests

Author: joaquim-verges

src/test/smart-wallet/Account.t.sol

@@ -607,10 +607,6 @@ contract SimpleAccountTest is BaseTest {
         EntryPoint(entrypoint).handleOps(userOp, beneficiary);
         assertEq(SimpleAccount(payable(account)).contractURI(), "https://thirdweb.com");
 
-        address[] memory targets = new address[](0);
-        uint256[] memory values = new uint256[](0);
-        bytes[] memory callData = new bytes[](0);
-
         address[] memory approvedTargets = new address[](0);
 
         IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(

src/test/smart-wallet/ManagedAccount.t.sol

@@ -306,6 +306,7 @@ contract ManagedAccountTest is BaseTest {
             IEntryPoint(payable(address(entrypoint))),
             extensions
         );
+        assertTrue(address(factory) != address(0), "factory address should not be zero");
     }
 
     /*///////////////////////////////////////////////////////////////

src/test/smart-wallet/account-permissions/setPermissionsForSigner.t.sol

@@ -323,7 +323,7 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         address[] memory approvedTargets = new address[](0);
 
         {
-            IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions
+            IAccountPermissions.SignerPermissionRequest memory request = IAccountPermissions
                 .SignerPermissionRequest(
                     accountSigner,
                     1,
@@ -336,8 +336,8 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
                     uidCache
                 );
 
-            bytes memory sig = _signSignerPermissionRequest(permissionsReq);
-            SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig);
+            bytes memory sig2 = _signSignerPermissionRequest(request);
+            SimpleAccount(payable(account)).setPermissionsForSigner(request, sig2);
 
             address[] memory adminsBefore = SimpleAccount(payable(account)).getAllAdmins();
             assertEq(adminsBefore[1], accountSigner);
@@ -347,7 +347,7 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
 
         uidCache = bytes32("new uid");
 
-        IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(
+        IAccountPermissions.SignerPermissionRequest memory req = IAccountPermissions.SignerPermissionRequest(
             accountSigner,
             2,
             approvedTargets,
@@ -359,8 +359,8 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
             uidCache
         );
 
-        bytes memory sig = _signSignerPermissionRequest(permissionsReq);
-        SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig);
+        bytes memory sig3 = _signSignerPermissionRequest(req);
+        SimpleAccount(payable(account)).setPermissionsForSigner(req, sig3);
 
         bool adminStatusAfter = SimpleAccount(payable(account)).isAdmin(accountSigner);
         address[] memory adminsAfter = SimpleAccount(payable(account)).getAllAdmins();
@@ -376,8 +376,6 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         address account = accountFactory.getAddress(accountAdmin, bytes(""));
         address[] memory approvedTargets = new address[](0);
 
-        bool adminStatusBefore = SimpleAccount(payable(account)).isAdmin(accountAdmin);
-
         IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(
             accountSigner,
             1,
@@ -393,8 +391,6 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         bytes memory sig = _signSignerPermissionRequest(permissionsReq);
         SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig);
 
-        bool adminStatusAfter = SimpleAccount(payable(account)).isAdmin(accountSigner);
-
         // Attempt replay UID
 
         IAccountPermissions.SignerPermissionRequest memory permissionsReqTwo = IAccountPermissions
@@ -471,8 +467,6 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         address account = accountFactory.getAddress(accountAdmin, bytes(""));
         address[] memory approvedTargets = new address[](0);
 
-        bool adminStatusBefore = SimpleAccount(payable(account)).isAdmin(accountSigner);
-
         IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(
             accountSigner,
             1,
@@ -497,8 +491,6 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         address account = accountFactory.getAddress(accountAdmin, bytes(""));
         address[] memory approvedTargets = new address[](0);
 
-        bool adminStatusBefore = SimpleAccount(payable(account)).isAdmin(accountSigner);
-
         IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(
             accountSigner,
             1,
@@ -523,8 +515,6 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         address account = accountFactory.getAddress(accountAdmin, bytes(""));
         address[] memory approvedTargets = new address[](0);
 
-        bool adminStatusBefore = SimpleAccount(payable(account)).isAdmin(accountSigner);
-
         IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions.SignerPermissionRequest(
             accountSigner,
             0,
@@ -551,7 +541,7 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
 
         {
             //set admin status
-            IAccountPermissions.SignerPermissionRequest memory permissionsReq = IAccountPermissions
+            IAccountPermissions.SignerPermissionRequest memory req = IAccountPermissions
                 .SignerPermissionRequest(
                     accountSigner,
                     1,
@@ -565,8 +555,8 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
                 );
 
             vm.prank(accountAdmin);
-            bytes memory sig = _signSignerPermissionRequest(permissionsReq);
-            SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig);
+            bytes memory sig2 = _signSignerPermissionRequest(req);
+            SimpleAccount(payable(account)).setPermissionsForSigner(req, sig2);
         }
 
         //test set signerPerms as admin
@@ -586,9 +576,9 @@ contract AccountPermissionsTest_setPermissionsForSigner is BaseTest {
         );
 
         vm.prank(accountAdmin);
-        bytes memory sig = _signSignerPermissionRequest(permissionsReq);
+        bytes memory sig3 = _signSignerPermissionRequest(permissionsReq);
         vm.expectRevert("already admin");
-        SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig);
+        SimpleAccount(payable(account)).setPermissionsForSigner(permissionsReq, sig3);
     }
 
     function test_state_setPermissionsForSigner() public {