treasury: Move some things around

livepeer · Jul 7, 2023 · 2866eb8 · 2866eb8
1 parent 237b790
commit 2866eb8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/contracts/treasury/BondingCheckpointsVotes.sol b/contracts/treasury/BondingCheckpointsVotes.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.9;
 
 import "../Manager.sol";
 import "../bonding/IBondingCheckpoints.sol";
-import "./IVotes.sol";
+import "./GovernorCountingOverridable.sol";
 
 /**
  * @title Interface for BondingCheckpoints

diff --git a/contracts/treasury/GovernorCountingOverridable.sol b/contracts/treasury/GovernorCountingOverridable.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.9;
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol";
 
 import "../bonding/libraries/EarningsPool.sol";
 import "../bonding/libraries/EarningsPoolLIP36.sol";
@@ -11,7 +12,10 @@ import "../Manager.sol";
 import "../IController.sol";
 import "../rounds/IRoundsManager.sol";
 import "../bonding/IBondingCheckpoints.sol";
-import "./IVotes.sol";
+
+interface IVotes is IERC5805Upgradeable {
+    function delegatedAt(address delegatee, uint256 timepoint) external returns (address);
+}
 
 /**
  * @title GovernorCountingOverridable
@@ -57,7 +61,7 @@ abstract contract GovernorCountingOverridable is Initializable, GovernorUpgradea
     // solhint-disable-next-line func-name-mixedcase
     function COUNTING_MODE() public pure virtual override returns (string memory) {
         // TODO: Figure out the right value for this
-        return "support=bravo&quorum=for,abstain";
+        return "support=bravo&quorum=for,abstain,against";
     }
 
     /**

diff --git a/contracts/treasury/IVotes.sol b/contracts/treasury/IVotes.sol
diff --git a/contracts/treasury/LivepeerGovernor.sol b/contracts/treasury/LivepeerGovernor.sol
@@ -16,7 +16,6 @@ import "../IController.sol";
 import "../rounds/IRoundsManager.sol";
 import "./GovernorCountingOverridable.sol";
 import "./BondingCheckpointsVotes.sol";
-import "./IVotes.sol";
 
 contract LivepeerGovernor is
     Initializable,
@@ -98,11 +97,11 @@ contract LivepeerGovernor is
         token = votes();
     }
 
-    function bondingCheckpointVotes() public view returns (BondingCheckpointsVotes) {
+    function bondingCheckpointVotes() internal view returns (BondingCheckpointsVotes) {
         return BondingCheckpointsVotes(controller.getContract(keccak256("BondingCheckpointsVotes")));
     }
 
-    function pollCreator() public view returns (PollCreator) {
+    function pollCreator() internal view returns (PollCreator) {
         return PollCreator(controller.getContract(keccak256("PollCreator")));
     }
 }