f - refactor recurring collector test

Author: matiasedgeandnode

packages/horizon/test/payments/recurring-collector/RecurringCollector.t.sol

@@ -4,8 +4,9 @@ pragma solidity 0.8.27;
 import { IRecurringCollector } from "../../../contracts/interfaces/IRecurringCollector.sol";
 import { RecurringCollector } from "../../../contracts/payments/collectors/RecurringCollector.sol";
 import { AuthorizableHelper } from "../../utilities/Authorizable.t.sol";
+import { Bounder } from "../../utils/Bounder.t.sol";
 
-contract RecurringCollectorHelper is AuthorizableHelper {
+contract RecurringCollectorHelper is AuthorizableHelper, Bounder {
     RecurringCollector public collector;
 
     constructor(
@@ -43,4 +44,19 @@ contract RecurringCollectorHelper is AuthorizableHelper {
 
         return signedRCAU;
     }
+
+    function withElapsedAcceptDeadline(
+        IRecurringCollector.RecurringCollectionAgreement memory rca
+    ) public view returns (IRecurringCollector.RecurringCollectionAgreement memory) {
+        require(block.timestamp > 0, "block.timestamp can't be zero");
+        rca.acceptDeadline = bound(rca.acceptDeadline, 0, block.timestamp - 1);
+        return rca;
+    }
+
+    function withOKAcceptDeadline(
+        IRecurringCollector.RecurringCollectionAgreement memory rca
+    ) public view returns (IRecurringCollector.RecurringCollectionAgreement memory) {
+        rca.acceptDeadline = boundTimestampMin(rca.acceptDeadline, block.timestamp);
+        return rca;
+    }
 }

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

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.27;
+
+import { IRecurringCollector } from "../../../contracts/interfaces/IRecurringCollector.sol";
+
+import { RecurringCollectorSharedTest } from "./shared.t.sol";
+
+contract RecurringCollectorAcceptTest is RecurringCollectorSharedTest {
+    /*
+     * TESTS
+     */
+
+    /* solhint-disable graph/func-name-mixedcase */
+
+    function test_Accept(FuzzyAcceptableRCA memory fuzzyAcceptableRCA) public {
+        _fuzzyAuthorizeAndAccept(fuzzyAcceptableRCA);
+    }
+
+    function test_Accept_Revert_WhenAcceptanceDeadlineElapsed(
+        IRecurringCollector.SignedRCA memory fuzzySignedRCA,
+        uint256 unboundedSkip
+    ) public {
+        skip(boundSkipFloor(unboundedSkip, 1));
+        fuzzySignedRCA.rca = _recurringCollectorHelper.withElapsedAcceptDeadline(fuzzySignedRCA.rca);
+
+        bytes memory expectedErr = abi.encodeWithSelector(
+            IRecurringCollector.RecurringCollectorAgreementAcceptanceElapsed.selector,
+            fuzzySignedRCA.rca.acceptDeadline
+        );
+        vm.expectRevert(expectedErr);
+        vm.prank(fuzzySignedRCA.rca.dataService);
+        _recurringCollector.accept(fuzzySignedRCA);
+    }
+
+    function test_Accept_Revert_WhenAlreadyAccepted(FuzzyAcceptableRCA memory fuzzyAcceptableRCA) public {
+        IRecurringCollector.SignedRCA memory signedRCA = _fuzzyAuthorizeAndAccept(fuzzyAcceptableRCA);
+
+        bytes memory expectedErr = abi.encodeWithSelector(
+            IRecurringCollector.RecurringCollectorAgreementAlreadyAccepted.selector,
+            signedRCA.rca.agreementId
+        );
+        vm.expectRevert(expectedErr);
+        vm.prank(signedRCA.rca.dataService);
+        _recurringCollector.accept(signedRCA);
+    }
+
+    /* solhint-enable graph/func-name-mixedcase */
+}

packages/horizon/test/payments/recurring-collector/accept.t.sol

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.27;
+
+import { IRecurringCollector } from "../../../contracts/interfaces/IRecurringCollector.sol";
+
+import { RecurringCollectorSharedTest } from "./shared.t.sol";
+
+contract RecurringCollectorCancelTest is RecurringCollectorSharedTest {
+    /*
+     * TESTS
+     */
+
+    /* solhint-disable graph/func-name-mixedcase */
+
+    function test_Cancel(FuzzyAcceptableRCA memory fuzzyAcceptableRCA) public {
+        _fuzzyAuthorizeAndAccept(fuzzyAcceptableRCA);
+        _cancel(fuzzyAcceptableRCA.rca);
+    }
+
+    function test_Cancel_Revert_WhenNotAccepted(
+        IRecurringCollector.RecurringCollectionAgreement memory fuzzyRCA
+    ) public {
+        bytes memory expectedErr = abi.encodeWithSelector(
+            IRecurringCollector.RecurringCollectorAgreementNeverAccepted.selector,
+            fuzzyRCA.agreementId
+        );
+        vm.expectRevert(expectedErr);
+        vm.prank(fuzzyRCA.dataService);
+        _recurringCollector.cancel(fuzzyRCA.agreementId);
+    }
+
+    function test_Cancel_Revert_WhenNotDataService(
+        FuzzyAcceptableRCA memory fuzzyAcceptableRCA,
+        address notDataService
+    ) public {
+        vm.assume(fuzzyAcceptableRCA.rca.dataService != notDataService);
+
+        _fuzzyAuthorizeAndAccept(fuzzyAcceptableRCA);
+
+        bytes memory expectedErr = abi.encodeWithSelector(
+            IRecurringCollector.RecurringCollectorDataServiceNotAuthorized.selector,
+            fuzzyAcceptableRCA.rca.agreementId,
+            notDataService
+        );
+        vm.expectRevert(expectedErr);
+        vm.prank(notDataService);
+        _recurringCollector.cancel(fuzzyAcceptableRCA.rca.agreementId);
+    }
+    /* solhint-enable graph/func-name-mixedcase */
+}