Skip to content

Commit a851d32

Browse files
DrZoltanFazekasDrZoltanFazekas
committed
Follow linter suggestions
1 parent 122d273 commit a851d32

22 files changed

+190
-144
lines changed

‎.solhint.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
"gas-calldata-parameters": "warn",
1616
"gas-indexed-events": "warn",
1717
"gas-length-in-loops": "warn",
18-
"comprehensive-interface": "warn",
18+
"comprehensive-interface": "off",
1919
"gas-increment-by-one": "off",
20-
"private-vars-leading-underscore": ["off", {"strict": false}],
20+
"private-vars-leading-underscore": ["warn", {"strict": false}],
2121
"named-parameters-mapping": "off",
2222
"foundry-test-functions": ["off"],
23-
"imports-order": "off",
24-
"max-line-length": ["off", 120]
23+
"imports-order": "warn",
24+
"max-line-length": ["warn", 120]
2525
}
2626
}

‎package-lock.json

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎script/CheckVariant.s.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {LIQUID_VARIANT} from "src/LiquidDelegation.sol";
8-
import {NONLIQUID_VARIANT} from "src/NonLiquidDelegation.sol";
9-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { Console } from "script/Console.s.sol";
7+
import { BaseDelegation } from "src/BaseDelegation.sol";
8+
import { LIQUID_VARIANT } from "src/LiquidDelegation.sol";
9+
import { NONLIQUID_VARIANT } from "src/NonLiquidDelegation.sol";
1010

1111
function variant(address proxy) view returns(bytes32) {
1212
BaseDelegation delegation = BaseDelegation(payable(proxy));

‎script/CheckVersion.s.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { Console } from "script/Console.s.sol";
7+
import { BaseDelegation } from "src/BaseDelegation.sol";
88

99
contract CheckVersion is Script {
1010

‎script/Claim.s.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { Console } from "script/Console.s.sol";
7+
import { BaseDelegation } from "src/BaseDelegation.sol";
88

99
contract Claim is Script {
1010
function run(address payable proxy) external {

‎script/CollectCommission.s.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {Console} from "script/Console.s.sol";
8-
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
9-
import {Console} from "script/Console.s.sol";
5+
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
6+
import { Script } from "forge-std/Script.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { Console } from "script/Console.s.sol";
9+
import { BaseDelegation } from "src/BaseDelegation.sol";
1010

1111
contract CollectCommission is Script {
1212
using Strings for string;

‎script/Configure.s.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {Console} from "script/Console.s.sol";
8-
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
9-
import {Console} from "script/Console.s.sol";
5+
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
6+
import { Script } from "forge-std/Script.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { Console } from "script/Console.s.sol";
9+
import { BaseDelegation } from "src/BaseDelegation.sol";
1010

1111
contract Configure is Script {
1212
using Strings for string;

‎script/Console.s.sol

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
7-
import {console} from "forge-std/console.sol";
8-
import {console2} from "forge-std/console2.sol";
5+
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
6+
import { console } from "forge-std/console.sol";
7+
import { console2 } from "forge-std/console2.sol";
8+
import { Script } from "forge-std/Script.sol";
99

1010
// A library wrapping and extending console.sol from Hardhat and console2.sol from
1111
// the Forge Standard Library. It is only meant to be used in Forge tests and scripts.

‎script/Deploy.s.sol

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {LiquidDelegation} from "src/LiquidDelegation.sol";
8-
import {NonLiquidDelegation} from "src/NonLiquidDelegation.sol";
9-
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
10-
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
11-
import {Console} from "script/Console.s.sol";
5+
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
6+
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
7+
import { Script } from "forge-std/Script.sol";
8+
import { Console } from "script/Console.s.sol";
9+
import { BaseDelegation } from "src/BaseDelegation.sol";
10+
import { LiquidDelegation } from "src/LiquidDelegation.sol";
11+
import { NonLiquidDelegation } from "src/NonLiquidDelegation.sol";
1212

1313
contract Deploy is Script {
1414
using Strings for string;

‎script/Stake.s.sol

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {NonRebasingLST} from "src/NonRebasingLST.sol";
7-
import {BaseDelegation} from "src/BaseDelegation.sol";
8-
import {LiquidDelegation, LIQUID_VARIANT} from "src/LiquidDelegation.sol";
9-
import {variant} from "script/CheckVariant.s.sol";
10-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { variant } from "script/CheckVariant.s.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { BaseDelegation } from "src/BaseDelegation.sol";
9+
import { LiquidDelegation, LIQUID_VARIANT } from "src/LiquidDelegation.sol";
10+
import { NonRebasingLST } from "src/NonRebasingLST.sol";
1111

1212
contract Stake is Script {
1313

‎script/StakeRewards.s.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { Console } from "script/Console.s.sol";
7+
import { BaseDelegation } from "src/BaseDelegation.sol";
88

99
contract StakeRewards is Script {
1010

‎script/Unstake.s.sol

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {NonRebasingLST} from "src/NonRebasingLST.sol";
7-
import {BaseDelegation} from "src/BaseDelegation.sol";
8-
import {LiquidDelegation, LIQUID_VARIANT} from "src/LiquidDelegation.sol";
9-
import {NonLiquidDelegation, NONLIQUID_VARIANT} from "src/NonLiquidDelegation.sol";
10-
import {variant} from "script/CheckVariant.s.sol";
11-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { variant } from "script/CheckVariant.s.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { BaseDelegation } from "src/BaseDelegation.sol";
9+
import { LiquidDelegation, LIQUID_VARIANT } from "src/LiquidDelegation.sol";
10+
import { NonLiquidDelegation, NONLIQUID_VARIANT } from "src/NonLiquidDelegation.sol";
11+
import { NonRebasingLST } from "src/NonRebasingLST.sol";
1212

1313
contract Unstake is Script {
1414

‎script/Upgrade.s.sol

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {BaseDelegation} from "src/BaseDelegation.sol";
7-
import {LiquidDelegation, LIQUID_VARIANT} from "src/LiquidDelegation.sol";
8-
import {NonLiquidDelegation, NONLIQUID_VARIANT} from "src/NonLiquidDelegation.sol";
9-
import {variant} from "script/CheckVariant.s.sol";
10-
import {Console} from "script/Console.s.sol";
5+
import { Script } from "forge-std/Script.sol";
6+
import { variant } from "script/CheckVariant.s.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { BaseDelegation } from "src/BaseDelegation.sol";
9+
import { LiquidDelegation, LIQUID_VARIANT } from "src/LiquidDelegation.sol";
10+
import { NonLiquidDelegation, NONLIQUID_VARIANT } from "src/NonLiquidDelegation.sol";
1111

1212
contract Upgrade is Script {
1313

‎script/WithdrawRewards.s.sol

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
pragma solidity ^0.8.28;
33

44
/* solhint-disable no-console */
5-
import {Script} from "forge-std/Script.sol";
6-
import {NonLiquidDelegation} from "src/NonLiquidDelegation.sol";
7-
import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
8-
import {Console} from "script/Console.s.sol";
5+
import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
6+
import { Script } from "forge-std/Script.sol";
7+
import { Console } from "script/Console.s.sol";
8+
import { NonLiquidDelegation } from "src/NonLiquidDelegation.sol";
99

1010
contract WithdrawRewards is Script {
1111
using Strings for string;

0 commit comments

Comments
 (0)