From 608c9aa472c80edb569114cc84ba2674b06301e6 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 11 Jan 2023 19:48:53 +0000 Subject: [PATCH 1/3] Fix governance docs typo #3947 --- docs/modules/ROOT/pages/governance.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/governance.adoc b/docs/modules/ROOT/pages/governance.adoc index 00a997db504..10f715b871d 100644 --- a/docs/modules/ROOT/pages/governance.adoc +++ b/docs/modules/ROOT/pages/governance.adoc @@ -185,7 +185,7 @@ contract MyGovernor is Governor, GovernorCompatibilityBravo, GovernorVotes, Gove function getVotes(address account, uint256 blockNumber) public view - override(IGovernor, GovernorVotes) + override(IGovernor, Governor) returns (uint256) { return super.getVotes(account, blockNumber); From 4da3aef4a403bdc2a42a5844669f6137fbfeb0d7 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 11 Jan 2023 18:44:29 -0300 Subject: [PATCH 2/3] fix imports --- docs/modules/ROOT/pages/governance.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/pages/governance.adoc b/docs/modules/ROOT/pages/governance.adoc index 10f715b871d..a1b3300ae32 100644 --- a/docs/modules/ROOT/pages/governance.adoc +++ b/docs/modules/ROOT/pages/governance.adoc @@ -145,11 +145,11 @@ We can optionally set a proposal threshold as well. This restricts proposal crea // SPDX-License-Identifier: MIT pragma solidity ^0.8.2; -import "./governance/Governor.sol"; -import "./governance/compatibility/GovernorCompatibilityBravo.sol"; -import "./governance/extensions/GovernorVotes.sol"; -import "./governance/extensions/GovernorVotesQuorumFraction.sol"; -import "./governance/extensions/GovernorTimelockControl.sol"; +import "@openzeppelin/contracts/governance/Governor.sol"; +import "@openzeppelin/contracts/governance/compatibility/GovernorCompatibilityBravo.sol"; +import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; +import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; +import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol"; contract MyGovernor is Governor, GovernorCompatibilityBravo, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl { constructor(IVotes _token, TimelockController _timelock) From 16432166482eb29e2732da2fc636f791e8f061ec Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 12 Jan 2023 09:47:23 +0100 Subject: [PATCH 3/3] Removing unecessary overrides --- docs/modules/ROOT/pages/governance.adoc | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docs/modules/ROOT/pages/governance.adoc b/docs/modules/ROOT/pages/governance.adoc index a1b3300ae32..aa27c0ba886 100644 --- a/docs/modules/ROOT/pages/governance.adoc +++ b/docs/modules/ROOT/pages/governance.adoc @@ -173,24 +173,6 @@ contract MyGovernor is Governor, GovernorCompatibilityBravo, GovernorVotes, Gove // The functions below are overrides required by Solidity. - function quorum(uint256 blockNumber) - public - view - override(IGovernor, GovernorVotesQuorumFraction) - returns (uint256) - { - return super.quorum(blockNumber); - } - - function getVotes(address account, uint256 blockNumber) - public - view - override(IGovernor, Governor) - returns (uint256) - { - return super.getVotes(account, blockNumber); - } - function state(uint256 proposalId) public view