f: add MIN_SECONDS_COLLECTION_WINDOW

Author: matiasedgeandnode

packages/horizon/contracts/payments/collectors/RecurringCollector.sol

@@ -21,6 +21,8 @@ import { MathUtils } from "../../libraries/MathUtils.sol";
 contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringCollector {
     using PPMMath for uint256;
 
+    uint32 public constant MIN_SECONDS_COLLECTION_WINDOW = 600;
+
     /// @notice The EIP712 typehash for the RecurringCollectionAgreement struct
     bytes32 public constant EIP712_RCA_TYPEHASH =
         keccak256(
@@ -318,16 +320,17 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
             RecurringCollectorAgreementInvalidParameters("endsAt not in future")
         );
 
-        // Collection window needs to be at least 2 hours
+        // Collection window needs to be at least MIN_SECONDS_COLLECTION_WINDOW
         require(
             _agreement.maxSecondsPerCollection > _agreement.minSecondsPerCollection &&
-                (_agreement.maxSecondsPerCollection - _agreement.minSecondsPerCollection >= 7200),
+                (_agreement.maxSecondsPerCollection - _agreement.minSecondsPerCollection >=
+                    MIN_SECONDS_COLLECTION_WINDOW),
             RecurringCollectorAgreementInvalidParameters("too small collection window")
         );
 
         // Agreement needs to last at least one min collection window
         require(
-            _agreement.endsAt - block.timestamp >= _agreement.minSecondsPerCollection + 7200,
+            _agreement.endsAt - block.timestamp >= _agreement.minSecondsPerCollection + MIN_SECONDS_COLLECTION_WINDOW,
             RecurringCollectorAgreementInvalidParameters("too small agreement window")
         );
     }

packages/horizon/test/unit/payments/recurring-collector/RecurringCollectorHelper.t.sol

@@ -103,7 +103,10 @@ contract RecurringCollectorHelper is AuthorizableHelper, Bounder {
     }
 
     function _sensibleDeadline(uint256 _seed) internal view returns (uint64) {
-        return uint64(bound(_seed, block.timestamp + 1, block.timestamp + 7200)); // between now and 2h
+        return
+            uint64(
+                bound(_seed, block.timestamp + 1, block.timestamp + uint256(collector.MIN_SECONDS_COLLECTION_WINDOW()))
+            ); // between now and +MIN_SECONDS_COLLECTION_WINDOW
     }
 
     function _sensibleEndsAt(uint256 _seed, uint32 _maxSecondsPerCollection) internal view returns (uint64) {
@@ -132,10 +135,14 @@ contract RecurringCollectorHelper is AuthorizableHelper, Bounder {
     function _sensibleMaxSecondsPerCollection(
         uint32 _seed,
         uint32 _minSecondsPerCollection
-    ) internal pure returns (uint32) {
+    ) internal view returns (uint32) {
         return
             uint32(
-                bound(_seed, _minSecondsPerCollection + 7200, 60 * 60 * 24 * 30) // between minSecondsPerCollection + 2h and 30 days
+                bound(
+                    _seed,
+                    _minSecondsPerCollection + uint256(collector.MIN_SECONDS_COLLECTION_WINDOW()),
+                    60 * 60 * 24 * 30
+                ) // between minSecondsPerCollection + 2h and 30 days
             );
     }
 }