chore: fix warnings in tests

amarinkovic · amarinkovic · commit 1dd4d9708b8f · 2024-12-04T16:13:39.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -41,20 +41,8 @@ facetsdeployed.txt
 .DS_Store
 
 bin/
-.idea/.gitignore
-.idea/contracts-next.iml
-.idea/misc.xml
-.idea/modules.xml
-.idea/runConfigurations.xml
-.idea/vcs.xml
-.metals
-.supermaven
 
 broadcast/**/31337/*
-
-# subgraph artifact
-NaymsDiamond.json
-
 broadcast/**/dry-run
 
 # coverage report
@@ -64,5 +52,3 @@ cov-html
 # gemforge.deployments.json
 .gemforge/*.json
 
-# Generated files
-script/deployment/S03UpgradeDiamond.s.sol
diff --git a/.solhint.json b/.solhint.json
@@ -9,6 +9,7 @@
     "const-name-snakecase": "off",
     "reason-string": "off",
     "var-name-mixedcase": "off",
-    "func-name-mixedcase": "off"
+    "func-name-mixedcase": "off",
+    "immutable-vars-naming": "off"
   }
 }
diff --git a/test/T01Deployment.t.sol b/test/T01Deployment.t.sol
@@ -8,7 +8,6 @@ import { D03ProtocolDefaults } from "./defaults/D03ProtocolDefaults.sol";
 import { InitDiamondFixture } from "./fixtures/InitDiamondFixture.sol";
 import { IDiamondLoupe } from "lib/diamond-2-hardhat/contracts/interfaces/IDiamondLoupe.sol";
 import { IDiamondCut } from "lib/diamond-2-hardhat/contracts/interfaces/IDiamondCut.sol";
-import { IDiamondProxy } from "src/generated/IDiamondProxy.sol";
 import { DiamondAlreadyInitialized } from "src/init/InitDiamond.sol";
 import { LibGovernance } from "src/libs/LibGovernance.sol";
 
diff --git a/test/T01LibERC20.t.sol b/test/T01LibERC20.t.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.20;
 
 // solhint-disable no-global-import
-import { Vm } from "forge-std/Vm.sol";
 import { D03ProtocolDefaults } from "./defaults/D03ProtocolDefaults.sol";
 import { DummyToken } from "./utils/DummyToken.sol";
 import { BadToken } from "./utils/BadToken.sol";
diff --git a/test/T01LibHelpers.t.sol b/test/T01LibHelpers.t.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.20;
 
 import { Test } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
 import { LibHelpers } from "../src/libs/LibHelpers.sol";
 
 contract T01LibHelpers is Test {
diff --git a/test/T02ACL.t.sol b/test/T02ACL.t.sol
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
-import { console2 } from "forge-std/console2.sol";
 import { D03ProtocolDefaults, LibHelpers, LC } from "./defaults/D03ProtocolDefaults.sol";
 import { MockAccounts } from "test/utils/users/MockAccounts.sol";
 import { Vm } from "forge-std/Vm.sol";
diff --git a/test/T02Access.t.sol b/test/T02Access.t.sol
@@ -1,14 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
-// import { c as c } from "forge-std/c.sol";
+
 import { D03ProtocolDefaults, LibHelpers, LC, c } from "./defaults/D03ProtocolDefaults.sol";
 import { Entity, SimplePolicy, Stakeholders } from "src/shared/FreeStructs.sol";
 import "src/shared/CustomErrors.sol";
 
-// updateRoleGroup | isRoleInGroup | groups [role][group] = bool
-// updateRoleAssigner | canGroupAssignRole | canAssign [role] = group
-// getRoleInContext | roles[objectId][contextId] = role
-
 contract T02Access is D03ProtocolDefaults {
     using LibHelpers for *;
 
diff --git a/test/T02Admin.t.sol b/test/T02Admin.t.sol
@@ -241,7 +241,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
         assertEq(entries[0].topics[0], keccak256("FunctionsLocked(bytes4[])"));
         (s_functionSelectors) = abi.decode(entries[0].data, (bytes4[]));
 
-        bytes4[] memory lockedFunctions = new bytes4[](22);
+        bytes4[] memory lockedFunctions = new bytes4[](23);
         lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
         lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
         lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
@@ -264,6 +264,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
         lockedFunctions[19] = IDiamondProxy.createSimplePolicy.selector;
         lockedFunctions[20] = IDiamondProxy.createEntity.selector;
         lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
+        lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
 
         for (uint256 i = 0; i < lockedFunctions.length; i++) {
             assertTrue(nayms.isFunctionLocked(lockedFunctions[i]));
@@ -323,6 +324,9 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
         vm.expectRevert("function is locked");
         nayms.collectRewards(bytes32(0));
 
+        vm.expectRevert("function is locked");
+        nayms.compoundRewards(bytes32(0));
+
         vm.expectRevert("function is locked");
         nayms.collectRewardsToInterval(bytes32(0), 5);
 
@@ -359,6 +363,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.payReward.selector), "function payReward locked");
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.collectRewards.selector), "function collectRewards locked");
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.collectRewardsToInterval.selector), "function collectRewardsToInterval locked");
+        assertFalse(nayms.isFunctionLocked(IDiamondProxy.compoundRewards.selector), "function compoundRewards locked");
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.cancelSimplePolicy.selector), "function cancelSimplePolicy locked");
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.createSimplePolicy.selector), "function createSimplePolicy locked");
         assertFalse(nayms.isFunctionLocked(IDiamondProxy.createEntity.selector), "function createEntity locked");
diff --git a/test/T02User.t.sol b/test/T02User.t.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.20;
 
 import { D03ProtocolDefaults, LibHelpers, LC } from "./defaults/D03ProtocolDefaults.sol";
 import { MockAccounts } from "test/utils/users/MockAccounts.sol";
-import { Vm } from "forge-std/Vm.sol";
 import "../src/shared/CustomErrors.sol";
 
 contract T02UserTest is D03ProtocolDefaults, MockAccounts {
diff --git a/test/T03SystemFacet.t.sol b/test/T03SystemFacet.t.sol
@@ -2,10 +2,7 @@
 pragma solidity 0.8.20;
 
 import { D03ProtocolDefaults, LibHelpers, LibAdmin, LC, c } from "./defaults/D03ProtocolDefaults.sol";
-
 import { MockAccounts } from "./utils/users/MockAccounts.sol";
-
-import { Entity } from "../src/shared/AppStorage.sol";
 import "../src/shared/CustomErrors.sol";
 
 contract T03SystemFacetTest is D03ProtocolDefaults, MockAccounts {
diff --git a/test/T03TokenizedVault.t.sol b/test/T03TokenizedVault.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.20;
 
 import { MockAccounts } from "./utils/users/MockAccounts.sol";
 import { c, D03ProtocolDefaults, LibHelpers, LC } from "./defaults/D03ProtocolDefaults.sol";
-import { Entity, CalculatedFees } from "../src/shared/AppStorage.sol";
+import { Entity } from "../src/shared/AppStorage.sol";
 import { IDiamondCut } from "lib/diamond-2-hardhat/contracts/interfaces/IDiamondCut.sol";
 import { TokenizedVaultFixture } from "test/fixtures/TokenizedVaultFixture.sol";
 import "src/shared/CustomErrors.sol";
diff --git a/test/T04Entity.t.sol b/test/T04Entity.t.sol
@@ -14,9 +14,9 @@ import { SimplePolicyFixture } from "test/fixtures/SimplePolicyFixture.sol";
 // solhint-disable no-global-import
 import "../src/shared/CustomErrors.sol";
 
+// solhint-disable no-console
 import { StdStyle } from "forge-std/StdStyle.sol";
 
-// solhint-disable no-console
 contract T04EntityTest is D03ProtocolDefaults {
     using LibHelpers for *;
     using StdStyle for *;
diff --git a/test/T04Market.t.sol b/test/T04Market.t.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
 
-import { D03ProtocolDefaults, LibHelpers, LibObject, LC, c } from "./defaults/D03ProtocolDefaults.sol";
+import { D03ProtocolDefaults, LibHelpers, LC } from "./defaults/D03ProtocolDefaults.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { StdStyle } from "forge-std/Test.sol";
 import { MockAccounts } from "./utils/users/MockAccounts.sol";
 
-import { Entity, MarketInfo, FeeSchedule, SimplePolicy, Stakeholders, CalculatedFees } from "src/shared/FreeStructs.sol";
+import { Entity, MarketInfo, SimplePolicy, Stakeholders } from "src/shared/FreeStructs.sol";
 
 import { StdStyle } from "forge-std/StdStyle.sol";
 
diff --git a/test/T05Fees.t.sol b/test/T05Fees.t.sol
@@ -7,7 +7,7 @@ import { StdStyle } from "forge-std/Test.sol";
 
 import { D03ProtocolDefaults, LC } from "./defaults/D03ProtocolDefaults.sol";
 import { Entity, FeeSchedule, CalculatedFees } from "../src/shared/AppStorage.sol";
-import { SimplePolicy, SimplePolicyInfo, Stakeholders } from "../src/shared/FreeStructs.sol";
+import { SimplePolicy, Stakeholders } from "../src/shared/FreeStructs.sol";
 import "src/shared/CustomErrors.sol";
 import { LibHelpers } from "src/libs/LibHelpers.sol";
 
diff --git a/test/T05TokenWrapper.t.sol b/test/T05TokenWrapper.t.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.20;
 import { Vm } from "forge-std/Vm.sol";
 
 import { D03ProtocolDefaults, c, LC } from "./defaults/D03ProtocolDefaults.sol";
-import { Entity } from "src/shared/FreeStructs.sol";
 import { ERC20Wrapper } from "../src/utils/ERC20Wrapper.sol";
 
 contract T05TokenWrapper is D03ProtocolDefaults {
diff --git a/test/T06Staking.t.sol b/test/T06Staking.t.sol
@@ -1,15 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.20;
 
-import { StdStorage, stdStorage, StdStyle, StdAssertions } from "forge-std/Test.sol";
-import { Vm } from "forge-std/Vm.sol";
+import { StdStorage, stdStorage, StdStyle } from "forge-std/Test.sol";
 import { D03ProtocolDefaults, c, LC, LibHelpers } from "./defaults/D03ProtocolDefaults.sol";
-import { StakingConfig, StakingState } from "src/shared/FreeStructs.sol";
+import { StakingConfig } from "src/shared/FreeStructs.sol";
 import { IDiamondCut } from "lib/diamond-2-hardhat/contracts/interfaces/IDiamondCut.sol";
 import { StakingFixture } from "test/fixtures/StakingFixture.sol";
 import { DummyToken } from "./utils/DummyToken.sol";
 import { LibTokenizedVaultStaking } from "src/libs/LibTokenizedVaultStaking.sol";
-import { IERC20 } from "src/interfaces/IERC20.sol";
 
 import { IntervalRewardPayedOutAlready, InvalidTokenRewardAmount, InvalidStakingAmount, InvalidStaker, EntityDoesNotExist, StakingAlreadyStarted, StakingNotStarted, StakingConfigDoesNotExist } from "src/shared/CustomErrors.sol";
 
@@ -27,17 +25,18 @@ contract T06Staking is D03ProtocolDefaults {
     uint64 private constant R = (85 * SCALE_FACTOR) / 100;
     uint64 private constant I = 30 days;
 
-    bytes32 immutable VTOKENID = makeId2(LC.OBJECT_TYPE_ENTITY, bytes20(keccak256(bytes("test"))));
+    bytes32 internal immutable VTOKENID = makeId2(LC.OBJECT_TYPE_ENTITY, bytes20(keccak256(bytes("test"))));
 
-    bytes32 VTOKENID1;
-    bytes32 NAYM_ID;
+    bytes32 internal VTOKENID1;
+    bytes32 internal NAYM_ID;
 
-    NaymsAccount bob;
-    NaymsAccount sue;
-    NaymsAccount lou;
 
-    NaymsAccount nlf;
-    DummyToken naymToken;
+    NaymsAccount internal bob;
+    NaymsAccount internal sue;
+    NaymsAccount internal lou;
+
+    NaymsAccount internal nlf;
+    DummyToken internal naymToken;
 
     uint256 private constant usdcTotal = 1_000_000e6;
     uint256 private constant wethTotal = 1_000_000e18;
@@ -48,18 +47,18 @@ contract T06Staking is D03ProtocolDefaults {
 
     uint256 private constant totalStakeAmount = bobStakeAmount + sueStakeAmount + louStakeAmount;
 
-    uint256 immutable rewardAmount = 100e6;
+    uint256 internal immutable rewardAmount = 100e6;
 
-    uint256 constant stakingStart = 100 days;
+    uint256 internal constant stakingStart = 100 days;
 
     StakingFixture internal stakingFixture;
 
-    mapping(bytes32 entityId => uint256) usdcBalance;
-    mapping(bytes32 entityId => mapping(uint64 index => uint256)) unclaimedReward;
+    mapping(bytes32 entityId => uint256) internal usdcBalance;
+    mapping(bytes32 entityId => mapping(uint64 index => uint256)) internal unclaimedReward;
 
-    uint256 bobCurrentReward;
-    uint256 sueCurrentReward;
-    uint256 louCurrentReward;
+    uint256 internal bobCurrentReward;
+    uint256 internal sueCurrentReward;
+    uint256 internal louCurrentReward;
 
     function setUp() public {
         stakingFixture = new StakingFixture();
diff --git a/test/T07Zaps.t.sol b/test/T07Zaps.t.sol
@@ -15,13 +15,13 @@ contract ZapFacetTest is D03ProtocolDefaults {
     NaymsAccount internal bob = makeNaymsAcc("Bob");
     NaymsAccount internal sue = makeNaymsAcc("Sue");
 
-    NaymsAccount nlf = makeNaymsAcc(LC.NLF_IDENTIFIER);
+    NaymsAccount internal nlf = makeNaymsAcc(LC.NLF_IDENTIFIER);
 
     uint64 private constant SCALE_FACTOR = 1_000_000; // 6 digits because USDC
     uint64 private constant A = (15 * SCALE_FACTOR) / 100;
     uint64 private constant R = (85 * SCALE_FACTOR) / 100;
     uint64 private constant I = 30 days;
-    bytes32 NAYM_ID = address(naymToken)._getIdForAddress();
+    bytes32 internal NAYM_ID = address(naymToken)._getIdForAddress();
     function initStaking(uint256 initDate) internal {
         StakingConfig memory config = StakingConfig({
             tokenId: NAYM_ID,
diff --git a/test/defaults/D03ProtocolDefaults.sol b/test/defaults/D03ProtocolDefaults.sol
@@ -5,18 +5,17 @@ import { Vm } from "forge-std/Vm.sol";
 
 import { D02TestSetup, LibHelpers, c } from "./D02TestSetup.sol";
 import { Entity, SimplePolicy, MarketInfo, Stakeholders, FeeSchedule } from "src/shared/FreeStructs.sol";
-import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 
 import { LibAdmin } from "src/libs/LibAdmin.sol";
-import { LibObject } from "src/libs/LibObject.sol";
 import { LibConstants as LC } from "src/libs/LibConstants.sol";
 import { StdStyle } from "forge-std/StdStyle.sol";
 
 import { IERC20 } from "src/interfaces/IERC20.sol";
 
 // solhint-disable no-console
 // solhint-disable state-visibility
+// solhint-disable max-states-count
 
 /// @notice Default test setup part 03
 ///         Protocol / project level defaults
diff --git a/test/fixtures/LibFeeRouterFixture.sol b/test/fixtures/LibFeeRouterFixture.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.20;
 
 import { LibConstants } from "src/libs/LibConstants.sol";
-import { LibFeeRouter, CalculatedFees, FeeAllocation, FeeSchedule } from "src/libs/LibFeeRouter.sol";
+import { LibFeeRouter, CalculatedFees } from "src/libs/LibFeeRouter.sol";
 
 /// Create a fixture to test the library LibFeeRouter
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`"const-name-snakecase": "off",`
`10`	`10`	`"reason-string": "off",`
`11`	`11`	`"var-name-mixedcase": "off",`
`12`		`- "func-name-mixedcase": "off"`
	`12`	`+ "func-name-mixedcase": "off",`
	`13`	`+ "immutable-vars-naming": "off"`
`13`	`14`	`}`
`14`	`15`	`}`