Allow resets outside voting period

aragon · Dec 13, 2024 · 2e9db89 · 2e9db89
1 parent ae21ce9
commit 2e9db89
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/src/voting/SimpleGaugeVoter.sol b/src/voting/SimpleGaugeVoter.sol
@@ -81,7 +81,7 @@ contract SimpleGaugeVoter is
     }
 
     /*///////////////////////////////////////////////////////////////
-                               Voting 
+                               Voting
     //////////////////////////////////////////////////////////////*/
 
     /// @notice extrememly simple for loop. We don't need reentrancy checks in this implementation
@@ -181,7 +181,7 @@ contract SimpleGaugeVoter is
         voteData.lastVoted = block.timestamp;
     }
 
-    function reset(uint256 _tokenId) external nonReentrant whenNotPaused whenVotingActive {
+    function reset(uint256 _tokenId) external nonReentrant whenNotPaused {
         if (!IVotingEscrow(escrow).isApprovedOrOwner(msg.sender, _tokenId))
             revert NotApprovedOrOwner();
         if (!isVoting(_tokenId)) revert NotCurrentlyVoting();

diff --git a/test/voting/GaugeVote.t.sol b/test/voting/GaugeVote.t.sol
@@ -77,15 +77,44 @@ contract TestGaugeVote is GaugeVotingBase {
         vm.expectRevert(VotingInactive.selector);
         voter.vote(0, votes);
 
-        // try to reset
-        vm.expectRevert(VotingInactive.selector);
-        voter.reset(0);
-
         // vote multiple
         vm.expectRevert(VotingInactive.selector);
         voter.voteMultiple(ids, votes);
     }
 
+    function testFuzz_canResetInDistributionPeriod() public {
+        // create the vote
+        votes.push(GaugeVote(1, gauge));
+
+        // vote
+        vm.startPrank(owner);
+        {
+            voter.vote(tokenId, votes);
+        }
+        vm.stopPrank();
+
+        // check the vote
+        assertEq(voter.isVoting(tokenId), true);
+
+        // warp to the next epoch
+        vm.warp(block.timestamp + 1 weeks);
+
+        vm.assume(!voter.votingActive());
+
+        // try to reset
+        vm.startPrank(owner);
+        {
+            voter.reset(tokenId);
+        }
+        vm.stopPrank();
+
+        assertEq(voter.isVoting(tokenId), false);
+    }
+
+    //Check vp is 0 after reset
+    //Check gaugeVotes are same before and after reset, and are 0 after next voting period
+    //
+
     // can't vote if you don't own the token
     function testCannotVoteIfYouDontOwnTheToken() public {
         // try to vote as this address (not the holder)