From e7660bbb19c0b204b0c62d73ff8dba332f6883bc Mon Sep 17 00:00:00 2001 From: Mihir Wadekar Date: Sun, 20 Mar 2022 17:17:56 -0700 Subject: [PATCH 1/2] Fixed typo --- contracts/governance/Governor.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/governance/Governor.sol b/contracts/governance/Governor.sol index 8907d9468d5..6abe715797d 100644 --- a/contracts/governance/Governor.sol +++ b/contracts/governance/Governor.sol @@ -247,7 +247,7 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor { ) public virtual override returns (uint256) { require( getVotes(_msgSender(), block.number - 1) >= proposalThreshold(), - "GovernorCompatibilityBravo: proposer votes below proposal threshold" + "Governor: proposer votes below proposal threshold" ); uint256 proposalId = hashProposal(targets, values, calldatas, keccak256(bytes(description))); From 4f4ca8fce9e5c7c3076a2b8d05c6da6bbfc34e89 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Fri, 25 Mar 2022 10:31:09 +0100 Subject: [PATCH 2/2] fix testing and adding changelog --- CHANGELOG.md | 3 ++- .../compatibility/GovernorCompatibilityBravo.test.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a64abe50308..68466f3a523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,9 @@ * `ERC1155`: Add a `_afterTokenTransfer` hook for improved extensibility. ([#3166](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3166)) * `DoubleEndedQueue`: a new data structure that supports efficient push and pop to both front and back, useful for FIFO and LIFO queues. ([#3153](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3153)) * `Governor`: improved security of `onlyGovernance` modifier when using an external executor contract (e.g. a timelock) that can operate without necessarily going through the governance protocol. ([#3147](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3147)) - * `ERC20FlashMint`: support infinite allowance when paying back a flash loan. ([#3226](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3226)) * `Governor`: Add a way to parameterize votes. This can be used to implement voting systems such as fractionalized voting, ERC721 based voting, or any number of other systems. The `params` argument added to `_countVote` method, and included in the newly added `_getVotes` method, can be used by counting and voting modules respectively for such purposes. + * `Governor`: rewording of revert reason for consistency. ([#3275](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3275)) + * `ERC20FlashMint`: support infinite allowance when paying back a flash loan. ([#3226](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3226)) * `TimelockController`: Add a separate canceller role for the ability to cancel. ([#3165](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3165)) * `draft-ERC20Permit`: replace `immutable` with `constant` for `_PERMIT_TYPEHASH` since the `keccak256` of string literals is treated specially and the hash is evaluated at compile time. ([#3196](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3196)) diff --git a/test/governance/compatibility/GovernorCompatibilityBravo.test.js b/test/governance/compatibility/GovernorCompatibilityBravo.test.js index 7ab8ed328d2..f585d88f3b9 100644 --- a/test/governance/compatibility/GovernorCompatibilityBravo.test.js +++ b/test/governance/compatibility/GovernorCompatibilityBravo.test.js @@ -218,7 +218,7 @@ contract('GovernorCompatibilityBravo', function (accounts) { it('if proposal doesnt meet proposalThreshold', async function () { await expectRevert( this.helper.propose({ from: other }), - 'GovernorCompatibilityBravo: proposer votes below proposal threshold', + 'Governor: proposer votes below proposal threshold', ); }); });