Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: switch the parameter order in the MinApprovalsOutOfBounds error in the Multisig #580

Merged
merged 1 commit into from
Apr 30, 2024
Merged

fix: switch the parameter order in the MinApprovalsOutOfBounds error in the Multisig #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/contracts/src/plugins/governance/multisig/Multisig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ contract Multisig is
// Check if the new address list length would become less than the current minimum number of approvals required.
if (newAddresslistLength < multisigSettings.minApprovals) {
revert MinApprovalsOutOfBounds({
limit: newAddresslistLength,
actual: multisigSettings.minApprovals
limit: multisigSettings.minApprovals,
actual: newAddresslistLength
});
}

Expand Down Expand Up @@ -323,7 +323,7 @@ contract Multisig is
/// @return approvals The number of approvals casted.
/// @return parameters The parameters of the proposal vote.
/// @return actions The actions to be executed in the associated DAO after the proposal has passed.
/// @param allowFailureMap A bitmap allowing the proposal to succeed, even if individual actions might revert. If the bit at index `i` is 1, the proposal succeeds even if the `i`th action reverts. A failure map value of 0 requires every action to not revert.
/// @return allowFailureMap A bitmap allowing the proposal to succeed, even if individual actions might revert. If the bit at index `i` is 1, the proposal succeeds even if the `i`th action reverts. A failure map value of 0 requires every action to not revert.
function getProposal(
uint256 _proposalId
)
Expand Down
8 changes: 4 additions & 4 deletions packages/contracts/test/plugins/governance/multisig/multisig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,8 @@ describe('Multisig', function () {
await expect(multisig.removeAddresses([signers[0].address]))
.to.be.revertedWithCustomError(multisig, 'MinApprovalsOutOfBounds')
.withArgs(
(await multisig.addresslistLength()).sub(1),
multisigSettings.minApprovals
multisigSettings.minApprovals,
(await multisig.addresslistLength()).sub(1)
);
});

Expand All @@ -465,8 +465,8 @@ describe('Multisig', function () {
await expect(multisig.removeAddresses([signers[2].address]))
.to.be.revertedWithCustomError(multisig, 'MinApprovalsOutOfBounds')
.withArgs(
(await multisig.addresslistLength()).sub(1),
multisigSettings.minApprovals
multisigSettings.minApprovals,
(await multisig.addresslistLength()).sub(1)
);
});
});
Expand Down
Loading