From 6b02e12b2449a9e356a25a951b147ffc21282f8b Mon Sep 17 00:00:00 2001
From: Giorgi Lagidze <glagh14@freeuni.edu.ge>
Date: Fri, 27 Sep 2024 12:31:38 +0400
Subject: [PATCH] remove unneccessary revoke

---
 packages/contracts/src/TokenVotingSetup.sol      | 16 ++++------------
 .../test/10_unit-testing/12_plugin-setup.ts      | 11 ++---------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/packages/contracts/src/TokenVotingSetup.sol b/packages/contracts/src/TokenVotingSetup.sol
index 4df253e7..40404dc3 100644
--- a/packages/contracts/src/TokenVotingSetup.sol
+++ b/packages/contracts/src/TokenVotingSetup.sol
@@ -293,7 +293,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
         SetupPayload calldata _payload
     ) external view returns (PermissionLib.MultiTargetPermission[] memory permissions) {
         // Prepare permissions.
-        permissions = new PermissionLib.MultiTargetPermission[](5);
+        permissions = new PermissionLib.MultiTargetPermission[](4);
 
         // Set permissions to be Revoked.
         permissions[0] = PermissionLib.MultiTargetPermission({
@@ -304,15 +304,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
             permissionId: tokenVotingBase.UPDATE_VOTING_SETTINGS_PERMISSION_ID()
         });
 
-        permissions[1] = PermissionLib.MultiTargetPermission(
-            PermissionLib.Operation.Revoke,
-            _payload.plugin,
-            _dao,
-            PermissionLib.NO_CONDITION,
-            UPGRADE_PLUGIN_PERMISSION_ID
-        );
-
-        permissions[2] = PermissionLib.MultiTargetPermission({
+        permissions[1] = PermissionLib.MultiTargetPermission({
             operation: PermissionLib.Operation.Revoke,
             where: _dao,
             who: _payload.plugin,
@@ -320,7 +312,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
             permissionId: EXECUTE_PERMISSION_ID
         });
 
-        permissions[3] = PermissionLib.MultiTargetPermission({
+        permissions[2] = PermissionLib.MultiTargetPermission({
             operation: PermissionLib.Operation.Revoke,
             where: _payload.plugin,
             who: _dao,
@@ -328,7 +320,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
             permissionId: SET_TARGET_CONFIG_PERMISSION_ID
         });
 
-        permissions[4] = PermissionLib.MultiTargetPermission(
+        permissions[3] = PermissionLib.MultiTargetPermission(
             PermissionLib.Operation.Revoke,
             _payload.plugin,
             address(type(uint160).max), // ANY_ADDR
diff --git a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
index 37d2cd47..dd4f6713 100644
--- a/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
+++ b/packages/contracts/test/10_unit-testing/12_plugin-setup.ts
@@ -914,13 +914,6 @@ describe('TokenVotingSetup', function () {
           AddressZero,
           UPDATE_VOTING_SETTINGS_PERMISSION_ID,
         ],
-        [
-          Operation.Revoke,
-          plugin,
-          dao.address,
-          AddressZero,
-          PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS.UPGRADE_PLUGIN_PERMISSION_ID,
-        ],
         [
           Operation.Revoke,
           dao.address,
@@ -944,7 +937,7 @@ describe('TokenVotingSetup', function () {
         ],
       ];
 
-      expect(permissions1.length).to.be.equal(5);
+      expect(permissions1.length).to.be.equal(4);
       expect(permissions1).to.deep.equal(essentialPermissions);
 
       const permissions2 = await pluginSetup.callStatic.prepareUninstallation(
@@ -956,7 +949,7 @@ describe('TokenVotingSetup', function () {
         }
       );
 
-      expect(permissions2.length).to.be.equal(5);
+      expect(permissions2.length).to.be.equal(4);
       expect(permissions2).to.deep.equal(essentialPermissions);
     });
   });