smoke test passing - bug fix active voting

collectivexyz · Aug 22, 2022 · 8b93518 · 8b93518
1 parent 154ba72
commit 8b93518
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/contracts/CollectiveGovernance.sol b/contracts/CollectiveGovernance.sol
@@ -126,7 +126,8 @@ contract CollectiveGovernance is Governance, VoteStrategy {
 
     function isOpen(uint256 _proposalId) public view requireStrategyVersion(_proposalId) returns (bool) {
         _storage._validOrRevert(_proposalId);
-        return isVoteOpenByProposalId[_proposalId];
+        uint256 endBlock = _storage.endBlock(_proposalId);
+        return isVoteOpenByProposalId[_proposalId] && block.number < endBlock;
     }
 
     /// @notice forbid any further voting
@@ -137,6 +138,9 @@ contract CollectiveGovernance is Governance, VoteStrategy {
         requireVoteOpen(_proposalId)
     {
         _storage._validOrRevert(_proposalId);
+        if (!_storage.isReady(_proposalId)) {
+            _storage.makeReady(_proposalId);
+        }
         uint256 _endBlock = _storage.endBlock(_proposalId);
         require(_endBlock < block.number, "Voting remains active");
         isVoteOpenByProposalId[_proposalId] = false;

diff --git a/contracts/GovernanceStorage.sol b/contracts/GovernanceStorage.sol
@@ -88,7 +88,7 @@ contract GovernanceStorage is Storage {
 
     modifier requireVotingActive(uint256 _proposalId) {
         Proposal storage proposal = proposalMap[_proposalId];
-        require(proposal.startBlock >= block.number && proposal.endBlock > block.number, "Vote not active");
+        require(proposal.startBlock <= block.number && proposal.endBlock > block.number, "Vote not active");
         _;
     }
 

diff --git a/test/CollectiveGovernance.t.sol b/test/CollectiveGovernance.t.sol
@@ -79,6 +79,17 @@ contract CollectiveGovernanceTest is Test {
         vm.stopPrank();
         vm.prank(voter);
         governance.voteFor(PROPOSAL_ID);
+        assertEq(_storage.forVotes(PROPOSAL_ID), 1);
+    }
+
+    function testCastSimpleVoteWhileActive() public {
+        vm.startPrank(owner, owner);
+        governance.configure(PROPOSAL_ID, 2, address(erc721), 10);
+        vm.stopPrank();
+        vm.prank(voter);
+        vm.roll(block.number + 2);
+        governance.voteFor(PROPOSAL_ID);
+        assertEq(_storage.forVotes(PROPOSAL_ID), 1);
     }
 
     function testFailNonVoter() public {
@@ -95,6 +106,7 @@ contract CollectiveGovernanceTest is Test {
         vm.stopPrank();
         vm.prank(voter);
         governance.voteAgainst(PROPOSAL_ID);
+        assertEq(_storage.againstVotes(PROPOSAL_ID), 1);
     }
 
     function testFailVoteAgainstNonVoter() public {
@@ -111,6 +123,7 @@ contract CollectiveGovernanceTest is Test {
         vm.stopPrank();
         vm.prank(voter);
         governance.abstainFromVote(PROPOSAL_ID);
+        assertEq(_storage.abstentionCount(PROPOSAL_ID), 1);
     }
 
     function testFailAbstentionNonVoter() public {
@@ -660,5 +673,4 @@ contract CollectiveGovernanceTest is Test {
     function testFailDirectStorageAccessToVeto() public {
         _storage._veto(PROPOSAL_ID);
     }
-
 }