f: fully commit to DataServiceFeesLib

Author: matiasedgeandnode

packages/horizon/contracts/data-service/extensions/DataServiceFees.sol

@@ -95,7 +95,7 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
      * @param _claimId The ID of the stake claim to delete
      */
     function _deleteStakeClaim(bytes32 _claimId) private {
-        delete claims[_claimId];
+        DataServiceFeesLib.deleteStakeClaim(claims, _claimId);
     }
 
     /**
@@ -105,6 +105,6 @@ abstract contract DataServiceFees is DataService, DataServiceFeesV1Storage, IDat
      * @return The next stake claim ID
      */
     function _getNextStakeClaim(bytes32 _claimId) private view returns (bytes32) {
-        return claims[_claimId].nextClaim;
+        return DataServiceFeesLib.getNextStakeClaim(claims, _claimId);
     }
 }

packages/horizon/contracts/data-service/libraries/DataServiceFeesLib.sol

@@ -92,6 +92,33 @@ library DataServiceFeesLib {
         return (false, _acc);
     }
 
+    /**
+     * @notice Deletes a stake claim.
+     * @dev This function is used as a callback in the stake claims linked list traversal.
+     * @param claims The mapping that stores stake claims by their ID
+     * @param claimId The ID of the stake claim to delete
+     */
+    function deleteStakeClaim(
+        mapping(bytes32 claimId => IDataServiceFees.StakeClaim claim) storage claims,
+        bytes32 claimId
+    ) external {
+        delete claims[claimId];
+    }
+
+    /**
+     * @notice Gets the next stake claim in the linked list
+     * @dev This function is used as a callback in the stake claims linked list traversal.
+     * @param claims The mapping that stores stake claims by their ID
+     * @param claimId The ID of the stake claim
+     * @return The next stake claim ID
+     */
+    function getNextStakeClaim(
+        mapping(bytes32 claimId => IDataServiceFees.StakeClaim claim) storage claims,
+        bytes32 claimId
+    ) external view returns (bytes32) {
+        return claims[claimId].nextClaim;
+    }
+
     /**
      * @notice Builds a stake claim ID
      * @param serviceProvider The address of the service provider