Merge pull request #1112 from graphprotocol/ma/horizon-fix-prettier

Author: tmigone

packages/horizon/package.json

@@ -12,7 +12,7 @@
   ],
   "scripts": {
     "lint:ts": "eslint '**/*.{js,ts}' --fix",
-    "lint:sol": "prettier --write contracts/**/*.sol && solhint --noPrompt --fix contracts/**/*.sol --config node_modules/solhint-graph-config/index.js",
+    "lint:sol": "prettier --write contracts/**/*.sol test/**/*.sol && solhint --noPrompt --fix contracts/**/*.sol --config node_modules/solhint-graph-config/index.js",
     "lint": "yarn lint:ts && yarn lint:sol",
     "clean": "rm -rf build dist cache cache_forge typechain-types",
     "build": "forge build --skip test && BUILD_RUN=true hardhat compile",

packages/horizon/test/GraphBase.t.sol

@@ -201,7 +201,12 @@ abstract contract GraphBaseTest is IHorizonStakingTypes, Utils, Constants {
             subgraphDataServiceLegacyAddress
         );
 
-        graphTallyCollector = new GraphTallyCollector("GraphTallyCollector", "1", address(controller), revokeSignerThawingPeriod);
+        graphTallyCollector = new GraphTallyCollector(
+            "GraphTallyCollector",
+            "1",
+            address(controller),
+            revokeSignerThawingPeriod
+        );
 
         resetPrank(users.governor);
         proxyAdmin.upgrade(stakingProxy, address(stakingBase));

packages/horizon/test/data-service/DataService.t.sol

@@ -65,7 +65,10 @@ contract DataServiceTest is HorizonStakingSharedTest {
         assertEq(max, dataServiceOverride.PROVISION_TOKENS_MAX());
     }
 
-    function test_ProvisionTokens_WhenCheckingAValidProvision_WithThawing(uint256 tokens, uint256 tokensThaw) external useIndexer {
+    function test_ProvisionTokens_WhenCheckingAValidProvision_WithThawing(
+        uint256 tokens,
+        uint256 tokensThaw
+    ) external useIndexer {
         dataService.setProvisionTokensRange(dataService.PROVISION_TOKENS_MIN(), dataService.PROVISION_TOKENS_MAX());
         tokens = bound(tokens, dataService.PROVISION_TOKENS_MIN(), dataService.PROVISION_TOKENS_MAX());
         tokensThaw = bound(tokensThaw, tokens - dataService.PROVISION_TOKENS_MIN() + 1, tokens);
@@ -313,12 +316,7 @@ contract DataServiceTest is HorizonStakingSharedTest {
             dataService.VERIFIER_CUT_MIN(),
             dataService.THAWING_PERIOD_MIN()
         );
-        _setProvisionParameters(
-            users.indexer,
-            address(dataService),
-            dataService.VERIFIER_CUT_MIN(),
-            thawingPeriod
-        );
+        _setProvisionParameters(users.indexer, address(dataService), dataService.VERIFIER_CUT_MIN(), thawingPeriod);
 
         // accept provision parameters
         vm.expectRevert(
@@ -351,12 +349,7 @@ contract DataServiceTest is HorizonStakingSharedTest {
             dataService.VERIFIER_CUT_MIN(),
             dataService.THAWING_PERIOD_MIN()
         );
-        _setProvisionParameters(
-            users.indexer,
-            address(dataService),
-            maxVerifierCut,
-            dataService.THAWING_PERIOD_MIN()
-        );
+        _setProvisionParameters(users.indexer, address(dataService), maxVerifierCut, dataService.THAWING_PERIOD_MIN());
 
         // accept provision parameters
         if (maxVerifierCut != dataService.VERIFIER_CUT_MIN()) {

packages/horizon/test/data-service/extensions/DataServiceFees.t.sol

@@ -146,7 +146,12 @@ contract DataServiceFeesTest is HorizonStakingSharedTest {
 
         // it should emit a an event
         vm.expectEmit();
-        emit IDataServiceFees.StakeClaimLocked(serviceProvider, calcValues.predictedClaimId, calcValues.stakeToLock, calcValues.unlockTimestamp);
+        emit IDataServiceFees.StakeClaimLocked(
+            serviceProvider,
+            calcValues.predictedClaimId,
+            calcValues.stakeToLock,
+            calcValues.unlockTimestamp
+        );
         dataService.lockStake(serviceProvider, tokens);
 
         // after state
@@ -195,7 +200,9 @@ contract DataServiceFeesTest is HorizonStakingSharedTest {
             tokensReleased: 0,
             head: beforeHead
         });
-        while (calcValues.head != bytes32(0) && (calcValues.claimsCount < numClaimsToRelease || numClaimsToRelease == 0)) {
+        while (
+            calcValues.head != bytes32(0) && (calcValues.claimsCount < numClaimsToRelease || numClaimsToRelease == 0)
+        ) {
             (uint256 claimTokens, , uint256 releasableAt, bytes32 nextClaim) = dataService.claims(calcValues.head);
             if (releasableAt > block.timestamp) {
                 break;

packages/horizon/test/data-service/implementations/DataServiceBase.sol

@@ -25,7 +25,11 @@ contract DataServiceBase is DataService {
 
     function stopService(address serviceProvider, bytes calldata data) external {}
 
-    function collect(address serviceProvider, IGraphPayments.PaymentTypes feeType, bytes calldata data) external returns (uint256) {}
+    function collect(
+        address serviceProvider,
+        IGraphPayments.PaymentTypes feeType,
+        bytes calldata data
+    ) external returns (uint256) {}
 
     function slash(address serviceProvider, bytes calldata data) external {}
 

packages/horizon/test/data-service/implementations/DataServiceBaseUpgradeable.sol

@@ -21,7 +21,11 @@ contract DataServiceBaseUpgradeable is DataService {
 
     function stopService(address serviceProvider, bytes calldata data) external {}
 
-    function collect(address serviceProvider, IGraphPayments.PaymentTypes feeType, bytes calldata data) external returns (uint256) {}
+    function collect(
+        address serviceProvider,
+        IGraphPayments.PaymentTypes feeType,
+        bytes calldata data
+    ) external returns (uint256) {}
 
     function slash(address serviceProvider, bytes calldata data) external {}
 

packages/horizon/test/data-service/implementations/DataServiceImpFees.sol

@@ -21,7 +21,11 @@ contract DataServiceImpFees is DataServiceFees {
 
     function stopService(address serviceProvider, bytes calldata data) external {}
 
-    function collect(address serviceProvider, IGraphPayments.PaymentTypes, bytes calldata data) external returns (uint256) {
+    function collect(
+        address serviceProvider,
+        IGraphPayments.PaymentTypes,
+        bytes calldata data
+    ) external returns (uint256) {
         uint256 amount = abi.decode(data, (uint256));
         _releaseStake(serviceProvider, 0);
         _lockStake(serviceProvider, amount * STAKE_TO_FEES_RATIO, block.timestamp + LOCK_DURATION);

packages/horizon/test/data-service/implementations/DataServiceImpPausable.sol

@@ -29,7 +29,11 @@ contract DataServiceImpPausable is DataServicePausable {
 
     function stopService(address serviceProvider, bytes calldata data) external {}
 
-    function collect(address serviceProvider, IGraphPayments.PaymentTypes feeType, bytes calldata data) external returns (uint256) {}
+    function collect(
+        address serviceProvider,
+        IGraphPayments.PaymentTypes feeType,
+        bytes calldata data
+    ) external returns (uint256) {}
 
     function slash(address serviceProvider, bytes calldata data) external {}
 

packages/horizon/test/data-service/implementations/DataServiceImpPausableUpgradeable.sol

@@ -23,7 +23,11 @@ contract DataServiceImpPausableUpgradeable is DataServicePausableUpgradeable {
 
     function stopService(address serviceProvider, bytes calldata data) external {}
 
-    function collect(address serviceProvider, IGraphPayments.PaymentTypes feeType, bytes calldata data) external returns (uint256) {}
+    function collect(
+        address serviceProvider,
+        IGraphPayments.PaymentTypes feeType,
+        bytes calldata data
+    ) external returns (uint256) {}
 
     function slash(address serviceProvider, bytes calldata data) external {}
 

packages/horizon/test/data-service/libraries/ProvisionTracker.t.sol

@@ -86,13 +86,19 @@ contract ProvisionTrackerTest is HorizonStakingSharedTest, ProvisionTrackerImple
         assertEq(provisionTracker[users.indexer], delta);
     }
 
-    function test_Release_RevertGiven_TheProvisionHasInsufficientLockedTokens(uint256 tokens) external useIndexer useProvisionDataService(address(this), tokens, 0, 0) {
+    function test_Release_RevertGiven_TheProvisionHasInsufficientLockedTokens(
+        uint256 tokens
+    ) external useIndexer useProvisionDataService(address(this), tokens, 0, 0) {
         // setup
         provisionTracker.lock(staking, users.indexer, tokens, uint32(0));
 
         uint256 tokensToRelease = tokens + 1;
         vm.expectRevert(
-            abi.encodeWithSelector(ProvisionTracker.ProvisionTrackerInsufficientTokens.selector, tokens, tokensToRelease)
+            abi.encodeWithSelector(
+                ProvisionTracker.ProvisionTrackerInsufficientTokens.selector,
+                tokens,
+                tokensToRelease
+            )
         );
         provisionTracker.release(users.indexer, tokensToRelease);
     }