ci: rename all vars name

aragon · Aug 29, 2024 · 9b6cf85 · 9b6cf85
1 parent 4fe246c
commit 9b6cf85
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/packages/contracts/src/MajorityVotingBase.sol b/packages/contracts/src/MajorityVotingBase.sol
@@ -493,11 +493,11 @@ abstract contract MajorityVotingBase is
 
     // todo TBD define if permission should be the same one as update settings
     /// @notice Updates the minimal approval value.
-    /// @param _minApproval The new minimal approval value.
+    /// @param _minApprovals The new minimal approval value.
     function updateMinApproval(
-        uint32 _minApproval
+        uint32 _minApprovals
     ) external virtual auth(UPDATE_VOTING_SETTINGS_PERMISSION_ID) {
-        _updateMinApproval(_minApproval);
+        _updateMinApproval(_minApprovals);
     }
 
     /// @notice Creates a new majority voting proposal.
@@ -647,16 +647,16 @@ abstract contract MajorityVotingBase is
     }
 
     /// @notice Internal function to update minimal approval value.
-    /// @param _minApproval The new minimal approval value.
-    function _updateMinApproval(uint32 _minApproval) internal virtual {
+    /// @param _minApprovals The new minimal approval value.
+    function _updateMinApproval(uint32 _minApprovals) internal virtual {
         // Require the minimum approval value to be in the interval [0, 10^6],
         // because `>=` comparison is used in the participation criterion.
-        if (_minApproval > RATIO_BASE) {
-            revert RatioOutOfBounds({limit: RATIO_BASE, actual: _minApproval});
+        if (_minApprovals > RATIO_BASE) {
+            revert RatioOutOfBounds({limit: RATIO_BASE, actual: _minApprovals});
         }
 
-        minApprovals = _minApproval;
-        emit VotingMinApprovalUpdated(_minApproval);
+        minApprovals = _minApprovals;
+        emit VotingMinApprovalUpdated(_minApprovals);
     }
 
     /// @notice Validates and returns the proposal vote dates.

diff --git a/packages/contracts/src/TokenVoting.sol b/packages/contracts/src/TokenVoting.sol
@@ -55,24 +55,24 @@ contract TokenVoting is IMembership, MajorityVotingBase {
     /// @param _dao The IDAO interface of the associated DAO.
     /// @param _votingSettings The voting settings.
     /// @param _token The [ERC-20](https://eips.ethereum.org/EIPS/eip-20) token used for voting.
-    /// @param _minApproval The minimal amount of approvals the proposal needs to succeed.
+    /// @param _minApprovals The minimal amount of approvals the proposal needs to succeed.
     function initialize(
         IDAO _dao,
         VotingSettings calldata _votingSettings,
         IVotesUpgradeable _token,
-        uint32 _minApproval
+        uint32 _minApprovals
     ) external initializer {
-        __MajorityVotingBase_init(_dao, _votingSettings, _minApproval);
+        __MajorityVotingBase_init(_dao, _votingSettings, _minApprovals);
 
         votingToken = _token;
 
         emit MembershipContractAnnounced({definingContract: address(_token)});
     }
 
     /// @notice Initializes the plugin after an upgrade from a previous version.
-    /// @param _minApproval The minimal amount of approvals the proposal needs to succeed.
-    function initializeFrom(uint32 _minApproval) external reinitializer(2) {
-        _updateMinApproval(_minApproval);
+    /// @param _minApprovals The minimal amount of approvals the proposal needs to succeed.
+    function initializeFrom(uint32 _minApprovals) external reinitializer(2) {
+        _updateMinApproval(_minApprovals);
     }
 
     /// @notice Checks if this or the parent contract supports an interface by its ID.

diff --git a/packages/contracts/src/TokenVotingSetup.sol b/packages/contracts/src/TokenVotingSetup.sol
@@ -97,7 +97,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
             TokenSettings memory tokenSettings,
             // only used for GovernanceERC20(token is not passed)
             GovernanceERC20.MintSettings memory mintSettings,
-            uint32 minApproval
+            uint32 minApprovals
         ) = abi.decode(
                 _data,
                 (
@@ -165,7 +165,7 @@ contract TokenVotingSetup is PluginUpgradeableSetup {
                 IDAO(_dao),
                 votingSettings,
                 IVotesUpgradeable(token),
-                minApproval
+                minApprovals
             )
         );
 

diff --git a/packages/contracts/src/mocks/MajorityVotingMock.sol b/packages/contracts/src/mocks/MajorityVotingMock.sol
@@ -8,9 +8,9 @@ contract MajorityVotingMock is MajorityVotingBase {
     function initializeMock(
         IDAO _dao,
         VotingSettings calldata _votingSettings,
-        uint32 _minApproval
+        uint32 _minApprovals
     ) public initializer {
-        __MajorityVotingBase_init(_dao, _votingSettings, _minApproval);
+        __MajorityVotingBase_init(_dao, _votingSettings, _minApprovals);
     }
 
     function createProposal(