f: remove RecurringCollectorAgreementInvalidParameters

Author: matiasedgeandnode

packages/horizon/contracts/interfaces/IRecurringCollector.sol

@@ -282,10 +282,35 @@ interface IRecurringCollector is IAuthorizable, IPaymentsCollector {
     error RecurringCollectorAgreementIncorrectState(bytes16 agreementId, AgreementState incorrectState);
 
     /**
-     * Thrown when accepting or upgrading an agreement with invalid parameters
-     * @param message A descriptive error message
+     * Thrown when accepting an agreement with an address that is not set
      */
-    error RecurringCollectorAgreementInvalidParameters(string message);
+    error RecurringCollectorAgreementAddressNotSet();
+
+    /**
+     * Thrown when accepting or upgrading an agreement with an elapsed endsAt
+     * @param currentTimestamp The current timestamp
+     * @param endsAt The agreement end timestamp
+     */
+    error RecurringCollectorAgreementElapsedEndsAt(uint256 currentTimestamp, uint64 endsAt);
+
+    /**
+     * Thrown when accepting or upgrading an agreement with an elapsed endsAt
+     * @param allowedMinCollectionWindow The allowed minimum collection window
+     * @param minSecondsPerCollection The minimum seconds per collection
+     * @param maxSecondsPerCollection The maximum seconds per collection
+     */
+    error RecurringCollectorAgreementInvalidCollectionWindow(
+        uint32 allowedMinCollectionWindow,
+        uint32 minSecondsPerCollection,
+        uint32 maxSecondsPerCollection
+    );
+
+    /**
+     * Thrown when accepting or upgrading an agreement with an invalid duration
+     * @param requiredMinDuration The required minimum duration
+     * @param invalidDuration The invalid duration
+     */
+    error RecurringCollectorAgreementInvalidDuration(uint32 requiredMinDuration, uint256 invalidDuration);
 
     /**
      * Thrown when calling collect() on an elapsed agreement

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

@@ -311,27 +311,34 @@ contract RecurringCollector is EIP712, GraphDirectory, Authorizable, IRecurringC
             _agreement.dataService != address(0) &&
                 _agreement.payer != address(0) &&
                 _agreement.serviceProvider != address(0),
-            RecurringCollectorAgreementInvalidParameters("zero address")
+            RecurringCollectorAgreementAddressNotSet()
         );
 
         // Agreement needs to end in the future
         require(
             _agreement.endsAt > block.timestamp,
-            RecurringCollectorAgreementInvalidParameters("endsAt not in future")
+            RecurringCollectorAgreementElapsedEndsAt(block.timestamp, _agreement.endsAt)
         );
 
         // Collection window needs to be at least MIN_SECONDS_COLLECTION_WINDOW
         require(
             _agreement.maxSecondsPerCollection > _agreement.minSecondsPerCollection &&
                 (_agreement.maxSecondsPerCollection - _agreement.minSecondsPerCollection >=
                     MIN_SECONDS_COLLECTION_WINDOW),
-            RecurringCollectorAgreementInvalidParameters("too small collection window")
+            RecurringCollectorAgreementInvalidCollectionWindow(
+                MIN_SECONDS_COLLECTION_WINDOW,
+                _agreement.minSecondsPerCollection,
+                _agreement.maxSecondsPerCollection
+            )
         );
 
         // Agreement needs to last at least one min collection window
         require(
             _agreement.endsAt - block.timestamp >= _agreement.minSecondsPerCollection + MIN_SECONDS_COLLECTION_WINDOW,
-            RecurringCollectorAgreementInvalidParameters("too small agreement window")
+            RecurringCollectorAgreementInvalidDuration(
+                _agreement.minSecondsPerCollection + MIN_SECONDS_COLLECTION_WINDOW,
+                _agreement.endsAt - block.timestamp
+            )
         );
     }