add nominate during nomination period also

Synthetixio · Aug 24, 2023 · e1a0118 · e1a0118
1 parent 83c4d42
commit e1a0118
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/protocol/governance/contracts/modules/core/BaseElectionModule.sol b/protocol/governance/contracts/modules/core/BaseElectionModule.sol
@@ -218,7 +218,7 @@ contract BaseElectionModule is
     function nominate() public virtual override {
         // TODO: onlyOnMothership?
 
-        Council.onlyInPeriod(Council.ElectionPeriod.Nomination);
+        Council.onlyInPeriods(Council.ElectionPeriod.Nomination, Council.ElectionPeriod.Vote);
 
         SetUtil.AddressSet storage nominees = Council.load().getCurrentElection().nominees;
 

diff --git a/protocol/governance/contracts/storage/Council.sol b/protocol/governance/contracts/storage/Council.sol
@@ -115,6 +115,17 @@ library Council {
         }
     }
 
+    /// @dev Used to allow certain functions to only operate within a given periods
+    function onlyInPeriods(
+        Council.ElectionPeriod period1,
+        Council.ElectionPeriod period2
+    ) internal view {
+        Council.ElectionPeriod currentPeriod = Council.getCurrentPeriod(load());
+        if (currentPeriod != period1 && currentPeriod != period2) {
+            revert NotCallableInCurrentPeriod();
+        }
+    }
+
     /// @dev Ensures epoch dates are in the correct order, durations are above minimums, etc
     function validateEpochSchedule(
         Data storage self,