chore: fix solhint (sablier-labs#1352)

smol-ninja · web-flow · commit 7c48b93059e9 · 2026-01-07T20:33:20.000+05:30
diff --git a/.solhint.json b/.solhint.json
@@ -11,6 +11,7 @@
     "gas-small-strings": "off",
     "gas-strict-inequalities": "off",
     "gas-struct-packing": "off",
+    "imports-order": "warn",
     "import-path-check": "off",
     "max-line-length": ["error", 128],
     "max-states-count": ["warn", 20],
diff --git a/airdrops/bun.lock b/airdrops/bun.lock
diff --git a/airdrops/tests/.solhint.json b/airdrops/tests/.solhint.json
@@ -1,13 +1,21 @@
 {
+  "extends": "solhint:recommended",
   "rules": {
     "avoid-low-level-calls": "off",
+    "compiler-version": ["error", ">=0.8.22"],
     "contract-name-capwords": "off",
     "func-name-mixedcase": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "function-max-lines": "off",
     "gas-calldata-parameters": "off",
     "gas-custom-errors": "off",
     "gas-increment-by-one": "off",
+    "gas-small-strings": "off",
+    "gas-strict-inequalities": "off",
+    "imports-order": "warn",
     "no-empty-blocks": "off",
     "one-contract-per-file": "off",
+    "use-natspec": "off",
     "var-name-mixedcase": "off"
   }
 }
diff --git a/flow/bun.lock b/flow/bun.lock
diff --git a/flow/tests/.solhint.json b/flow/tests/.solhint.json
@@ -1,12 +1,21 @@
 {
+  "extends": "solhint:recommended",
   "rules": {
     "avoid-low-level-calls": "off",
+    "compiler-version": ["error", ">=0.8.22"],
     "contract-name-capwords": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "function-max-lines": "off",
     "func-name-mixedcase": "off",
     "gas-calldata-parameters": "off",
     "gas-custom-errors": "off",
     "gas-increment-by-one": "off",
+    "gas-small-strings": "off",
+    "gas-strict-inequalities": "off",
+    "gas-struct-packing": "off",
+    "imports-order": "warn",
     "no-empty-blocks": "off",
-    "one-contract-per-file": "off"
+    "one-contract-per-file": "off",
+    "use-natspec": "off"
   }
 }
diff --git a/flow/tests/fork/Flow.t.sol b/flow/tests/fork/Flow.t.sol
@@ -3,8 +3,8 @@ pragma solidity >=0.8.22;
 
 import { IERC4906 } from "@openzeppelin/contracts/interfaces/IERC4906.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { ud21x18, UD21x18 } from "@prb/math/src/UD21x18.sol";
 
diff --git a/flow/tests/fork/Fork.t.sol b/flow/tests/fork/Fork.t.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.22;
 
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { ISablierFlow } from "src/interfaces/ISablierFlow.sol";
 
 import { Base_Test } from "../Base.t.sol";
diff --git a/lockup/bun.lock b/lockup/bun.lock
diff --git a/lockup/tests/.solhint.json b/lockup/tests/.solhint.json
@@ -1,11 +1,23 @@
 {
+  "extends": "solhint:recommended",
   "rules": {
+    "avoid-low-level-calls": "off",
     "const-name-snakecase": "off",
+    "compiler-version": ["error", ">=0.8.22"],
     "contract-name-capwords": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "function-max-lines": "off",
     "func-name-mixedcase": "off",
     "gas-calldata-parameters": "off",
     "gas-custom-errors": "off",
+    "gas-increment-by-one": "off",
+    "gas-small-strings": "off",
+    "gas-strict-inequalities": "off",
+    "gas-struct-packing": "off",
+    "imports-order": "warn",
+    "no-empty-blocks": "off",
     "one-contract-per-file": "off",
-    "no-console": "off"
+    "no-console": "off",
+    "use-natspec": "off"
   }
 }
diff --git a/utils/.solhint.json b/utils/.solhint.json
@@ -1,9 +1,20 @@
 {
+  "extends": "solhint:recommended",
   "rules": {
+    "avoid-low-level-calls": "off",
     "code-complexity": "off",
+    "compiler-version": ["error", ">=0.8.22"],
     "contract-name-capwords": "off",
+    "func-visibility": ["error", { "ignoreConstructors": true }],
+    "function-max-lines": "off",
     "func-name-mixedcase": "off",
     "gas-custom-errors": "off",
-    "one-contract-per-file": "off"
+    "gas-indexed-events": "off",
+    "gas-small-strings": "off",
+    "gas-strict-inequalities": "off",
+    "imports-order": "warn",
+    "no-empty-blocks": "off",
+    "one-contract-per-file": "off",
+    "use-natspec": "off"
   }
 }
diff --git a/utils/src/SablierComptroller.sol b/utils/src/SablierComptroller.sol
@@ -2,9 +2,9 @@
 pragma solidity >=0.8.22;
 
 import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
-import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { ERC165Upgradeable } from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
 import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import { ERC165Upgradeable } from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
+import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 import { IComptrollerable } from "./interfaces/IComptrollerable.sol";
 import { ISablierComptroller } from "./interfaces/ISablierComptroller.sol";
diff --git a/utils/src/interfaces/ISablierComptroller.sol b/utils/src/interfaces/ISablierComptroller.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.22;
 
-import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { IERC1822Proxiable } from "@openzeppelin/contracts/interfaces/draft-IERC1822.sol";
+import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { IRoleAdminable } from "./IRoleAdminable.sol";
 
 /// @title ISablierComptroller
diff --git a/utils/tests/.solhint.json b/utils/tests/.solhint.json
@@ -1,7 +1,9 @@
 {
+  "extends": "solhint:recommended",
   "rules": {
     "code-complexity": "off",
     "contract-name-capwords": "off",
-    "gas-increment-by-one": "off"
+    "gas-increment-by-one": "off",
+    "imports-order": "warn"
   }
 }
diff --git a/utils/tests/Base.t.sol b/utils/tests/Base.t.sol
@@ -13,8 +13,8 @@ import { RoleAdminableMock } from "src/mocks/RoleAdminableMock.sol";
 import { BaseTest } from "src/tests/BaseTest.sol";
 
 import { Modifiers } from "./utils/Modifiers.sol";
-import { Utils } from "./utils/Utils.sol";
 import { Users } from "./utils/Types.sol";
+import { Utils } from "./utils/Utils.sol";
 
 /// @notice Base test contract with common logic needed by all tests.
 abstract contract Base_Test is BaseTest, Modifiers, StdAssertions, Utils {
diff --git a/utils/tests/integration/concrete/comptroller/initialize/initialize.t.sol b/utils/tests/integration/concrete/comptroller/initialize/initialize.t.sol
@@ -4,8 +4,8 @@ pragma solidity >=0.8.22;
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/src/Upgrades.sol";
 
-import { Errors } from "src/libraries/Errors.sol";
 import { ISablierComptroller } from "src/interfaces/ISablierComptroller.sol";
+import { Errors } from "src/libraries/Errors.sol";
 import { SablierComptroller } from "src/SablierComptroller.sol";
 
 import { Base_Test } from "tests/Base.t.sol";
diff --git a/utils/tests/integration/concrete/comptroller/upgrade-to-and-call/upgradeToAndCall.t.sol b/utils/tests/integration/concrete/comptroller/upgrade-to-and-call/upgradeToAndCall.t.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.22;
 
 import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import { SablierComptroller } from "src/SablierComptroller.sol";
 import { Errors } from "src/libraries/Errors.sol";
+import { SablierComptroller } from "src/SablierComptroller.sol";
 import { Base_Test } from "tests/Base.t.sol";
 
 contract UpgradeToAndCall_Comptroller_Concrete_Test is Base_Test {
diff --git a/utils/tests/invariant/Comptroller.t.sol b/utils/tests/invariant/Comptroller.t.sol
@@ -2,9 +2,8 @@
 pragma solidity >=0.8.26;
 
 import { StdInvariant } from "forge-std/src/StdInvariant.sol";
-import { ComptrollerHandler } from "./handlers/ComptrollerHandler.sol";
-
 import { Base_Test } from "../Base.t.sol";
+import { ComptrollerHandler } from "./handlers/ComptrollerHandler.sol";
 
 contract Comptroller_Invariant_Test is Base_Test, StdInvariant {
     ComptrollerHandler public comptrollerHandler;
