GovernorExtendedVoting testing

OpenZeppelin · Nov 16, 2021 · 7b64140 · 7b64140
1 parent ff0d213
commit 7b64140
Show file tree

Hide file tree

Showing 6 changed files with 294 additions and 86 deletions.
diff --git a/contracts/mocks/GovernorExtendedVotingMock.sol b/contracts/mocks/GovernorExtendedVotingMock.sol
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import "./GovernorMock.sol";
+import "../governance/extensions/GovernorExtendedVoting.sol";
+
+contract GovernorExtendedVotingMock is GovernorMock, GovernorExtendedVoting {
+    uint256 private _quorum;
+
+    constructor(
+        string memory name_,
+        ERC20Votes token_,
+        uint256 votingDelay_,
+        uint256 votingPeriod_,
+        uint256 quorum_,
+        uint64 votingDelayExtention_
+    )
+        GovernorMock(name_, token_, votingDelay_, votingPeriod_, 0)
+        GovernorExtendedVoting(votingDelayExtention_)
+    {
+        _quorum = quorum_;
+    }
+
+    function quorum(uint256) public view virtual override returns (uint256) {
+        return _quorum;
+    }
+
+    function proposalDeadline(uint256 proposalId) public view virtual override(Governor, GovernorExtendedVoting) returns (uint256) {
+        return super.proposalDeadline(proposalId);
+    }
+
+    function proposalThreshold() public view virtual override(Governor, GovernorMock) returns (uint256) {
+        return super.proposalThreshold();
+    }
+
+    function propose(
+        address[] memory targets,
+        uint256[] memory values,
+        bytes[] memory calldatas,
+        string memory description
+    ) public virtual override(Governor, GovernorMock) returns (uint256) {
+        return super.propose(targets, values, calldatas, description);
+    }
+
+    function _castVote(
+        uint256 proposalId,
+        address account,
+        uint8 support,
+        string memory reason
+    ) internal virtual override(Governor, GovernorExtendedVoting) returns (uint256) {
+        return super._castVote(proposalId, account, support, reason);
+    }
+}
diff --git a/contracts/mocks/GovernorMock.sol b/contracts/mocks/GovernorMock.sol
@@ -45,7 +45,7 @@ contract GovernorMock is
         return super.getVotes(account, blockNumber);
     }
 
-    function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
+    function proposalThreshold() public view virtual override(Governor, GovernorSettings) returns (uint256) {
         return super.proposalThreshold();
     }
 

diff --git a/contracts/mocks/GovernorTimelockCompoundMock.sol b/contracts/mocks/GovernorTimelockCompoundMock.sol
@@ -2,17 +2,10 @@
 
 pragma solidity ^0.8.0;
 
+import "./GovernorMock.sol";
 import "../governance/extensions/GovernorTimelockCompound.sol";
-import "../governance/extensions/GovernorSettings.sol";
-import "../governance/extensions/GovernorCountingSimple.sol";
-import "../governance/extensions/GovernorVotesQuorumFraction.sol";
 
-contract GovernorTimelockCompoundMock is
-    GovernorSettings,
-    GovernorTimelockCompound,
-    GovernorVotesQuorumFraction,
-    GovernorCountingSimple
-{
+contract GovernorTimelockCompoundMock is GovernorMock, GovernorTimelockCompound {
     constructor(
         string memory name_,
         ERC20Votes token_,
@@ -21,11 +14,8 @@ contract GovernorTimelockCompoundMock is
         ICompoundTimelock timelock_,
         uint256 quorumNumerator_
     )
-        Governor(name_)
+        GovernorMock(name_, token_, votingDelay_, votingPeriod_, quorumNumerator_)
         GovernorTimelockCompound(timelock_)
-        GovernorSettings(votingDelay_, votingPeriod_, 0)
-        GovernorVotes(token_)
-        GovernorVotesQuorumFraction(quorumNumerator_)
     {}
 
     function supportsInterface(bytes4 interfaceId)
@@ -38,24 +28,6 @@ contract GovernorTimelockCompoundMock is
         return super.supportsInterface(interfaceId);
     }
 
-    function quorum(uint256 blockNumber)
-        public
-        view
-        override(IGovernor, GovernorVotesQuorumFraction)
-        returns (uint256)
-    {
-        return super.quorum(blockNumber);
-    }
-
-    function cancel(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 salt
-    ) public returns (uint256 proposalId) {
-        return _cancel(targets, values, calldatas, salt);
-    }
-
     /**
      * Overriding nightmare
      */
@@ -69,7 +41,7 @@ contract GovernorTimelockCompoundMock is
         return super.state(proposalId);
     }
 
-    function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
+    function proposalThreshold() public view override(Governor, GovernorMock) returns (uint256) {
         return super.proposalThreshold();
     }
 
@@ -92,16 +64,6 @@ contract GovernorTimelockCompoundMock is
         return super._cancel(targets, values, calldatas, salt);
     }
 
-    function getVotes(address account, uint256 blockNumber)
-        public
-        view
-        virtual
-        override(IGovernor, GovernorVotes)
-        returns (uint256)
-    {
-        return super.getVotes(account, blockNumber);
-    }
-
     function _executor() internal view virtual override(Governor, GovernorTimelockCompound) returns (address) {
         return super._executor();
     }

diff --git a/contracts/mocks/GovernorTimelockControlMock.sol b/contracts/mocks/GovernorTimelockControlMock.sol
@@ -2,17 +2,10 @@
 
 pragma solidity ^0.8.0;
 
+import "./GovernorMock.sol";
 import "../governance/extensions/GovernorTimelockControl.sol";
-import "../governance/extensions/GovernorSettings.sol";
-import "../governance/extensions/GovernorCountingSimple.sol";
-import "../governance/extensions/GovernorVotesQuorumFraction.sol";
 
-contract GovernorTimelockControlMock is
-    GovernorSettings,
-    GovernorTimelockControl,
-    GovernorVotesQuorumFraction,
-    GovernorCountingSimple
-{
+contract GovernorTimelockControlMock is GovernorMock, GovernorTimelockControl {
     constructor(
         string memory name_,
         ERC20Votes token_,
@@ -21,11 +14,8 @@ contract GovernorTimelockControlMock is
         TimelockController timelock_,
         uint256 quorumNumerator_
     )
-        Governor(name_)
+        GovernorMock(name_, token_, votingDelay_, votingPeriod_, quorumNumerator_)
         GovernorTimelockControl(timelock_)
-        GovernorSettings(votingDelay_, votingPeriod_, 0)
-        GovernorVotes(token_)
-        GovernorVotesQuorumFraction(quorumNumerator_)
     {}
 
     function supportsInterface(bytes4 interfaceId)
@@ -38,24 +28,6 @@ contract GovernorTimelockControlMock is
         return super.supportsInterface(interfaceId);
     }
 
-    function quorum(uint256 blockNumber)
-        public
-        view
-        override(IGovernor, GovernorVotesQuorumFraction)
-        returns (uint256)
-    {
-        return super.quorum(blockNumber);
-    }
-
-    function cancel(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 descriptionHash
-    ) public returns (uint256 proposalId) {
-        return _cancel(targets, values, calldatas, descriptionHash);
-    }
-
     /**
      * Overriding nightmare
      */
@@ -69,7 +41,7 @@ contract GovernorTimelockControlMock is
         return super.state(proposalId);
     }
 
-    function proposalThreshold() public view override(Governor, GovernorSettings) returns (uint256) {
+    function proposalThreshold() public view override(Governor, GovernorMock) returns (uint256) {
         return super.proposalThreshold();
     }
 
@@ -92,16 +64,6 @@ contract GovernorTimelockControlMock is
         return super._cancel(targets, values, calldatas, descriptionHash);
     }
 
-    function getVotes(address account, uint256 blockNumber)
-        public
-        view
-        virtual
-        override(IGovernor, GovernorVotes)
-        returns (uint256)
-    {
-        return super.getVotes(account, blockNumber);
-    }
-
     function _executor() internal view virtual override(Governor, GovernorTimelockControl) returns (address) {
         return super._executor();
     }

diff --git a/test/governance/GovernorWorkflow.behavior.js b/test/governance/GovernorWorkflow.behavior.js
@@ -65,7 +65,7 @@ function runGovernorWorkflow () {
     // vote
     if (tryGet(this.settings, 'voters')) {
       this.receipts.castVote = [];
-      for (const voter of this.settings.voters) {
+      for (const voter of this.settings.voters.filter(({ support }) => !!support)) {
         if (!voter.signature) {
           this.receipts.castVote.push(
             await getReceiptOrRevert(