From 9b6cf851f3229eddf93537e1da909d848f4d1c9c Mon Sep 17 00:00:00 2001 From: Claudia Date: Thu, 29 Aug 2024 17:50:16 +0200 Subject: [PATCH] ci: rename all vars name --- packages/contracts/src/MajorityVotingBase.sol | 18 +++++++++--------- packages/contracts/src/TokenVoting.sol | 12 ++++++------ packages/contracts/src/TokenVotingSetup.sol | 4 ++-- .../contracts/src/mocks/MajorityVotingMock.sol | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/contracts/src/MajorityVotingBase.sol b/packages/contracts/src/MajorityVotingBase.sol index 8b6eb222..5c8ce463 100644 --- 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 index 94ad3faa..70545071 100644 --- a/packages/contracts/src/TokenVoting.sol +++ b/packages/contracts/src/TokenVoting.sol @@ -55,14 +55,14 @@ 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; @@ -70,9 +70,9 @@ contract TokenVoting is IMembership, MajorityVotingBase { } /// @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 index 735d9008..f32f74f2 100644 --- 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 index 0e9714c4..c2c32031 100644 --- 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(