language touchups

contracts/JBChainlinkV3PriceFeed.sol

@@ -29,10 +29,10 @@ contract JBChainlinkV3PriceFeed is IJBPriceFeed {
     // ------------------------- external views -------------------------- //
     //*********************************************************************//
 
-    /// @notice Gets the current price from the feed, normalized to the specified number of decimals.
+    /// @notice Gets the current price (per unit) from the feed, normalized to the specified number of decimals.
     /// @param _decimals The number of decimals the returned fixed point price should include.
     /// @return The current price of the feed, as a fixed point number with the specified number of decimals.
-    function currentPrice(uint256 _decimals) external view override returns (uint256) {
+    function currentUnitPrice(uint256 _decimals) external view override returns (uint256) {
         // Get the latest round information.
         (uint80 roundId, int256 _price,, uint256 updatedAt, uint80 answeredInRound) =
             feed.latestRoundData();

contracts/JBDeadline.sol

@@ -3,54 +3,47 @@ pragma solidity ^0.8.16;
 
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import {JBBallotState} from "./enums/JBBallotState.sol";
-import {IJBFundingCycleBallot} from "./interfaces/IJBFundingCycleBallot.sol";
-import {JBFundingCycle} from "./structs/JBFundingCycle.sol";
-
-/// @notice Manages approving funding cycle reconfigurations automatically after a buffer period.
-contract JBReconfigurationBufferBallot is ERC165, IJBFundingCycleBallot {
-    //*********************************************************************//
-    // --------------------------- custom errors ------------------------- //
-    //*********************************************************************//
-
-    /// @notice Throw if the duration used to initialize this contract is too long.
-    error WRONG_DURATION();
+import {JBApprovalStatus} from "./enums/JBApprovalStatus.sol";
+import {IJBRulesetApprovalHook} from "./interfaces/IJBRulesetApprovalHook.sol";
+import {JBRuleset} from "./structs/JBRuleset.sol";
 
+/// @notice Ruleset approval hook which rejects rulesets if they are not queued at least `duration` seconds before the current ruleset ends. In other words, rulesets must be queued before the deadline to take effect.
+contract JBDeadline is ERC165, IJBRulesetApprovalHook {
     //*********************************************************************//
     // ---------------- public immutable stored properties --------------- //
     //*********************************************************************//
 
-    /// @notice The number of seconds that must pass for a funding cycle reconfiguration to become either `Approved` or `Failed`.
+    /// @notice The minimum difference between the time a ruleset is queued and the time it starts, as a number of seconds. If the difference is greater than this number, the ruleset is `Approved`.
     uint256 public immutable override duration;
 
     //*********************************************************************//
     // -------------------------- public views --------------------------- //
     //*********************************************************************//
 
-    /// @notice The approval state of a particular funding cycle.
-    /// @param _projectId The ID of the project to which the funding cycle being checked belongs.
-    /// @param _configured The configuration of the funding cycle to check the state of.
-    /// @param _start The start timestamp of the funding cycle to check the state of.
-    /// @return The state of the provided ballot.
-    function stateOf(uint256 _projectId, uint256 _configured, uint256 _start)
+    /// @notice The approval status of a particular ruleset.
+    /// @param _projectId The ID of the project to which the ruleset being checked belongs.
+    /// @param _rulesetId The `rulesetId` of the ruleset to check the status of. The `rulesetId` is the timestamp for when ruleset was queued.
+    /// @param _start The start timestamp of the ruleset to check the status of.
+    /// @return The status of the approval hook.
+    function approvalStatusOf(uint256 _projectId, uint256 _rulesetId, uint256 _start)
         public
         view
         override
-        returns (JBBallotState)
+        returns (JBApprovalStatus)
     {
         _projectId; // Prevents unused var compiler and natspec complaints.
 
-        // If the provided configured timestamp is after the start timestamp, the ballot is Failed.
-        if (_configured > _start) return JBBallotState.Failed;
+        // If the provided rulesetId timestamp is after the start timestamp, the approval hook is Failed.
+        if (_rulesetId > _start) return JBApprovalStatus.Failed;
 
         unchecked {
-            // If there was sufficient time between configuration and the start of the cycle, it is approved. Otherwise, it is failed.
-            // If the ballot hasn't yet started, it's state is ApprovalExpected.
-            return (_start - _configured < duration)
-                ? JBBallotState.Failed
+            // If there was sufficient time between queuing and the start of the ruleset, it is approved. Otherwise, it is failed.
+            // If the approval hook hasn't yet started, its approval status is ApprovalExpected.
+            return (_start - _rulesetId < duration)
+                ? JBApprovalStatus.Failed
                 : (block.timestamp < _start - duration)
-                    ? JBBallotState.ApprovalExpected
-                    : JBBallotState.Approved;
+                    ? JBApprovalStatus.ApprovalExpected
+                    : JBApprovalStatus.Approved;
         }
     }
 
@@ -65,19 +58,16 @@ contract JBReconfigurationBufferBallot is ERC165, IJBFundingCycleBallot {
         override(ERC165, IERC165)
         returns (bool)
     {
-        return _interfaceId == type(IJBFundingCycleBallot).interfaceId
+        return _interfaceId == type(IJBRulesetApprovalHook).interfaceId
             || super.supportsInterface(_interfaceId);
     }
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
     //*********************************************************************//
 
-    /// @param _duration The number of seconds to wait until a reconfiguration can be either `Approved` or `Failed`.
+    /// @param _duration The minimum number of seconds between the time a ruleset is queued and that ruleset's `start` for it to be `Approved`.
     constructor(uint256 _duration) {
-        // Insure we don't underflow in state Of
-        if (_duration > block.timestamp) revert WRONG_DURATION();
-
         duration = _duration;
     }
 }