f: remove SubgraphServiceLib

Author: matiasedgeandnode

packages/subgraph-service/contracts/libraries/IndexingAgreement.sol

@@ -5,16 +5,17 @@ import { IGraphPayments } from "@graphprotocol/horizon/contracts/interfaces/IGra
 import { IRecurringCollector } from "@graphprotocol/horizon/contracts/interfaces/IRecurringCollector.sol";
 import { GraphDirectory } from "@graphprotocol/horizon/contracts/utilities/GraphDirectory.sol";
 
+import { ISubgraphService } from "../interfaces/ISubgraphService.sol";
+import { AllocationManager } from "../utilities/AllocationManager.sol";
 import { SubgraphService } from "../SubgraphService.sol";
 import { Directory } from "../utilities/Directory.sol";
 import { Allocation } from "./Allocation.sol";
-import { SubgraphServiceLib } from "./SubgraphServiceLib.sol";
 import { IndexingAgreementDecoder } from "./IndexingAgreementDecoder.sol";
 
 library IndexingAgreement {
     using IndexingAgreement for StorageManager;
+    using Allocation for Allocation.State;
     using Allocation for mapping(address => Allocation.State);
-    using SubgraphServiceLib for mapping(address => Allocation.State);
 
     /// @notice Versions of Indexing Agreement Metadata
     enum IndexingAgreementVersion {
@@ -287,7 +288,8 @@ library IndexingAgreement {
         address allocationId,
         IRecurringCollector.SignedRCA calldata signedRCA
     ) external {
-        Allocation.State memory allocation = allocations.requireValidAllocation(
+        Allocation.State memory allocation = _requireValidAllocation(
+            allocations,
             allocationId,
             signedRCA.rca.serviceProvider
         );
@@ -512,7 +514,8 @@ library IndexingAgreement {
         CollectParams memory params
     ) external returns (address, uint256) {
         AgreementWrapper memory wrapper = _get(self, params.agreementId);
-        Allocation.State memory allocation = allocations.requireValidAllocation(
+        Allocation.State memory allocation = _requireValidAllocation(
+            allocations,
             wrapper.agreement.allocationId,
             wrapper.collectorAgreement.serviceProvider
         );
@@ -636,6 +639,33 @@ library IndexingAgreement {
         _directory().recurringCollector().cancel(_agreementId, _cancelBy);
     }
 
+    /**
+     * @notice Requires that the allocation is valid and owned by the indexer.
+     *
+     * Requirements:
+     * - Allocation must belong to the indexer
+     * - Allocation must be open
+     *
+     * @param _allocations The mapping of allocation IDs to their states
+     * @param _allocationId The id of the allocation
+     * @param _indexer The address of the indexer
+     * @return The allocation state
+     */
+    function _requireValidAllocation(
+        mapping(address => Allocation.State) storage _allocations,
+        address _allocationId,
+        address _indexer
+    ) private view returns (Allocation.State memory) {
+        Allocation.State memory allocation = _allocations.get(_allocationId);
+        require(
+            allocation.indexer == _indexer,
+            ISubgraphService.SubgraphServiceAllocationNotAuthorized(_indexer, _allocationId)
+        );
+        require(allocation.isOpen(), AllocationManager.AllocationManagerAllocationClosed(_allocationId));
+
+        return allocation;
+    }
+
     /**
      * @notice Calculate the number of tokens to collect for an indexing agreement.
      *