NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused return value and reuse helper function (#4588)

Browse Source 
Co-authored-by: Francisco Giordano <fg@frang.io>
This commit is contained in:
Hadrien Croubois
2023-09-08 23:24:23 +02:00
committed by GitHub
parent 01659449d4
commit bba33516b1
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/governance/Governor.sol
View File

@ -635,10 +635,7 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
string memory reason, string memory reason,
bytes memory params bytes memory params
) internal virtual returns (uint256) { ) internal virtual returns (uint256) {
ProposalState currentState = state(proposalId); _validateStateBitmap(proposalId, _encodeStateBitmap(ProposalState.Active));
if (currentState != ProposalState.Active) {
revert GovernorUnexpectedProposalState(proposalId, currentState, _encodeStateBitmap(ProposalState.Active));
}
uint256 weight = _getVotes(account, proposalSnapshot(proposalId), params); uint256 weight = _getVotes(account, proposalSnapshot(proposalId), params);
_countVote(proposalId, account, support, weight, params); _countVote(proposalId, account, support, weight, params);

3
contracts/utils/Nonces.sol
View File

@ -36,11 +36,10 @@ abstract contract Nonces {
/** /**
* @dev Same as {_useNonce} but checking that `nonce` is the next valid for `owner`. * @dev Same as {_useNonce} but checking that `nonce` is the next valid for `owner`.
*/ */
function _useCheckedNonce(address owner, uint256 nonce) internal virtual returns (uint256) { function _useCheckedNonce(address owner, uint256 nonce) internal virtual {
uint256 current = _useNonce(owner); uint256 current = _useNonce(owner);
if (nonce != current) { if (nonce != current) {
revert InvalidAccountNonce(owner, current); revert InvalidAccountNonce(owner, current);
} }
return current;
} }
} }

3
test/utils/Nonces.test.js
View File

@ -42,8 +42,7 @@ contract('Nonces', function (accounts) {
const currentNonce = await this.nonces.nonces(sender); const currentNonce = await this.nonces.nonces(sender);
expect(currentNonce).to.be.bignumber.equal('0'); expect(currentNonce).to.be.bignumber.equal('0');
const { receipt } = await this.nonces.$_useCheckedNonce(sender, currentNonce); await this.nonces.$_useCheckedNonce(sender, currentNonce);
expectEvent(receipt, 'return$_useCheckedNonce', [currentNonce]);
expect(await this.nonces.nonces(sender)).to.be.bignumber.equal('1'); expect(await this.nonces.nonces(sender)).to.be.bignumber.equal('1');
}); });