Merge pull request #4 from indexed-finance/meta-governance

Removed _castVote wrapper
indexed-finance · Jan 26, 2021 · ca51a51 · ca51a51
2 parents da78631 + b7bc530
commit ca51a51
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/contracts/meta/MetaGovernorCOMP.sol b/contracts/meta/MetaGovernorCOMP.sol
@@ -128,10 +128,6 @@ contract MetaGovernorCOMP {
     emit ExternalVoteSubmitted(proposalId, support);
   }
 
-  function castVote(uint256 proposalId, bool support) external {
-    return _castVote(msg.sender, proposalId, support);
-  }
-
   function _getMetaProposal(uint256 proposalId) internal returns (MetaProposal storage) {
     // Get the meta proposal if it exists, else initialize the block fields using the external proposal.
     MetaProposal storage proposal = proposals[proposalId];
@@ -143,22 +139,18 @@ contract MetaGovernorCOMP {
     return proposal;
   }
 
-  function _castVote(
-    address voter,
-    uint256 proposalId,
-    bool support
-  ) internal {
+  function castVote(uint256 proposalId, bool support) external {
     MetaProposal storage proposal = _getMetaProposal(proposalId);
     require(
       _state(proposal) == MetaProposalState.Active,
       "MetaGovernorCOMP::_castVote: meta proposal not active"
     );
-    Receipt storage receipt = proposal.receipts[voter];
+    Receipt storage receipt = proposal.receipts[msg.sender];
     require(
       receipt.hasVoted == false,
       "MetaGovernorCOMP::_castVote: voter already voted"
     );
-    uint96 votes = ndx.getPriorVotes(voter, proposal.startBlock);
+    uint96 votes = ndx.getPriorVotes(msg.sender, proposal.startBlock);
     require(
       votes > 0,
       "MetaGovernorCOMP::_castVote: caller has no delegated NDX"
@@ -174,7 +166,7 @@ contract MetaGovernorCOMP {
     receipt.support = support;
     receipt.votes = votes;
 
-    emit MetaVoteCast(voter, proposalId, support, votes);
+    emit MetaVoteCast(msg.sender, proposalId, support, votes);
   }
 
   function state(uint256 proposalId) external view returns (MetaProposalState) {

diff --git a/contracts/meta/MetaGovernorUNI.sol b/contracts/meta/MetaGovernorUNI.sol
@@ -128,10 +128,6 @@ contract MetaGovernorUNI {
     emit ExternalVoteSubmitted(proposalId, support);
   }
 
-  function castVote(uint256 proposalId, bool support) external {
-    return _castVote(msg.sender, proposalId, support);
-  }
-
   function _getMetaProposal(uint256 proposalId) internal returns (MetaProposal storage) {
     // Get the meta proposal if it exists, else initialize the block fields using the external proposal.
     MetaProposal storage proposal = proposals[proposalId];
@@ -143,22 +139,18 @@ contract MetaGovernorUNI {
     return proposal;
   }
 
-  function _castVote(
-    address voter,
-    uint256 proposalId,
-    bool support
-  ) internal {
+  function castVote(uint256 proposalId, bool support) external {
     MetaProposal storage proposal = _getMetaProposal(proposalId);
     require(
       _state(proposal) == MetaProposalState.Active,
       "MetaGovernorUNI::_castVote: meta proposal not active"
     );
-    Receipt storage receipt = proposal.receipts[voter];
+    Receipt storage receipt = proposal.receipts[msg.sender];
     require(
       receipt.hasVoted == false,
       "MetaGovernorUNI::_castVote: voter already voted"
     );
-    uint96 votes = ndx.getPriorVotes(voter, proposal.startBlock);
+    uint96 votes = ndx.getPriorVotes(msg.sender, proposal.startBlock);
     require(
       votes > 0,
       "MetaGovernorUNI::_castVote: caller has no delegated NDX"
@@ -174,7 +166,7 @@ contract MetaGovernorUNI {
     receipt.support = support;
     receipt.votes = votes;
 
-    emit MetaVoteCast(voter, proposalId, support, votes);
+    emit MetaVoteCast(msg.sender, proposalId, support, votes);
   }
 
   function state(uint256 proposalId) external view returns (MetaProposalState) {