Fix lintings (#178)

* fix linting changes * fixing other errors, like non-explict type
RealityETH · Jan 10, 2024 · d4ab107 · d4ab107
1 parent 5ebc920
commit d4ab107
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 80 deletions.
diff --git a/.solhint.json b/.solhint.json
@@ -2,9 +2,13 @@
   "extends": "solhint:recommended",
   "plugins": ["prettier"],
   "rules": {
+    "no-unused-import": "error",
     "compiler-version": "off",
     "max-states-count": "off",
     "no-empty-blocks": "off",
-    "func-visibility": ["warn",{"ignoreConstructors":true}]
+    "func-visibility": ["warn",{"ignoreConstructors":true}],
+    "custom-errors": "off",
+    "reason-string": "off",
+    "one-contract-per-file": "off"
   }
 }
diff --git a/.solhintignore b/.solhintignore
@@ -20,3 +20,6 @@
 /contracts/TokenBridge.sol
 /contracts/ERC20.sol
 lib/zkevm-contracts/contracts/mocks/VerifierRollupHelperMock.sol
+contracts/hardhat-dependency-compiler
+contracts/lib/reality-eth
+test/testcontract/ForkableZkEVMMock.sol
diff --git a/contracts/AdjudicationFramework.sol b/contracts/AdjudicationFramework.sol
@@ -7,10 +7,7 @@ pragma solidity ^0.8.20;
 /* solhint-disable not-rely-on-time */
 
 import {BalanceHolder} from "./lib/reality-eth/BalanceHolder.sol";
-
 import {IRealityETH} from "./lib/reality-eth/interfaces/IRealityETH.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 
 /*

diff --git a/contracts/ChainIdManager.sol b/contracts/ChainIdManager.sol
@@ -4,10 +4,10 @@ pragma solidity ^0.8.20;
 // The ChainIdManager contract provides a list of new usable chainIds via the getNextUsableChainId function.
 // If a project uses one chainId, it can be added to the deny list and then no other project will use it.
 // The contract does not come with an owner, but anyone can add chainIds to the deny list.
-// It costs just gasBurnAmount to deny list a chainId.
+// It costs just GAS_BURN_AMOUNT to deny list a chainId.
 // The burnGas function introduces this cost to use up chainIds.
 // There are uint64(2**63=9.223372e+18) chainIds minus the publicly used chainIds available.
-// Using all of the chainIds would cost 9.223372e+18 * gasBurnAmount = 9.223372e+24 gas = 6.1489147e+17 blocks = 237226647377 years
+// Using all of the chainIds would cost 9.223372e+18 * GAS_BURN_AMOUNT = 9.223372e+24 gas = 6.1489147e+17 blocks = 237226647377 years
 
 contract ChainIdManager {
     // Counter for the number of Chain IDs
@@ -16,7 +16,7 @@ contract ChainIdManager {
     // they are anyone who is willing to pay the gas to use them.
     mapping(uint64 => bool) public deniedChainIds;
     // Fee to use up a chain ID
-    uint256 public immutable gasBurnAmount = 1000000;
+    uint256 public immutable GAS_BURN_AMOUNT = 1000000;
 
     constructor(uint64 _chainIdCounter) {
         chainIdCounter = _chainIdCounter;
@@ -55,11 +55,11 @@ contract ChainIdManager {
     }
 
     /**
-     * @dev Burns gasBurnAmount gas to incure a cost for everyone calling this function
+     * @dev Burns GAS_BURN_AMOUNT gas to incure a cost for everyone calling this function
      */
     function burnGas() public view {
         uint256 counter = 0;
-        uint256 _lowestLimit = gasleft() - gasBurnAmount;
+        uint256 _lowestLimit = gasleft() - GAS_BURN_AMOUNT;
         while (gasleft() > _lowestLimit) counter++;
     }
 }
diff --git a/contracts/ForkableBridge.sol b/contracts/ForkableBridge.sol
@@ -6,7 +6,6 @@ import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfa
 import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IForkableBridge} from "./interfaces/IForkableBridge.sol";
-import {IForkonomicToken} from "./interfaces/IForkonomicToken.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {BridgeAssetOperations} from "./lib/BridgeAssetOperations.sol";
 

diff --git a/contracts/ForkableGlobalExitRoot.sol b/contracts/ForkableGlobalExitRoot.sol
@@ -2,8 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {PolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMGlobalExitRoot.sol";
-import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {IForkableGlobalExitRoot} from "./interfaces/IForkableGlobalExitRoot.sol";

diff --git a/contracts/ForkableZkEVM.sol b/contracts/ForkableZkEVM.sol
@@ -5,8 +5,6 @@ import {PolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/inheritedMainC
 import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-
-import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {IForkableZkEVM} from "./interfaces/IForkableZkEVM.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";

diff --git a/contracts/ForkingManager.sol b/contracts/ForkingManager.sol
@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
-import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
@@ -12,7 +9,6 @@ import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {ForkableStructure} from "./mixin/ForkableStructure.sol";
 import {IForkableBridge} from "./interfaces/IForkableBridge.sol";
 import {IForkableZkEVM} from "./interfaces/IForkableZkEVM.sol";

diff --git a/contracts/L1GlobalForkRequester.sol b/contracts/L1GlobalForkRequester.sol
@@ -9,11 +9,8 @@ pragma solidity ^0.8.20;
 */
 
 import {IForkingManager} from "./interfaces/IForkingManager.sol";
-import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 import {IForkonomicToken} from "./interfaces/IForkonomicToken.sol";
 import {IForkableBridge} from "./interfaces/IForkableBridge.sol";
-import {IBridgeMessageReceiver} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBridgeMessageReceiver.sol";
 
 import {MoneyBox} from "./mixin/MoneyBox.sol";
 import {CalculateMoneyBoxAddress} from "./lib/CalculateMoneyBoxAddress.sol";
@@ -156,7 +153,7 @@ contract L1GlobalForkRequester {
         );
 
         if (doYesToken) {
-            uint newAmountToMigrate = amount -
+            uint256 newAmountToMigrate = amount -
                 failedRequests[token][requester][requestId].amountMigratedYes;
             failedRequests[yesToken][requester][requestId]
                 .amount += newAmountToMigrate;

diff --git a/contracts/interfaces/IForkableBridge.sol b/contracts/interfaces/IForkableBridge.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
-import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
 import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IBasePolygonZkEVMGlobalExitRoot.sol";
 import {IForkableStructure} from "./IForkableStructure.sol";

diff --git a/test/AdjudicationIntegration.t.sol b/test/AdjudicationIntegration.t.sol
@@ -16,7 +16,6 @@ import {RealityETH_v3_0} from "../contracts/lib/reality-eth/RealityETH-3.0.sol";
 import {AdjudicationFramework} from "../contracts/AdjudicationFramework.sol";
 
 import {L2ForkArbitrator} from "../contracts/L2ForkArbitrator.sol";
-import {L1GlobalChainInfoPublisher} from "../contracts/L1GlobalChainInfoPublisher.sol";
 import {L1GlobalForkRequester} from "../contracts/L1GlobalForkRequester.sol";
 import {L2ChainInfo} from "../contracts/L2ChainInfo.sol";
 

diff --git a/test/ChainIdManager.t.sol b/test/ChainIdManager.t.sol
@@ -2,7 +2,6 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol"; // Hypothetical test library
 import {ChainIdManager} from "../contracts/ChainIdManager.sol"; // Path to the ChainIdManager contract
-import {Util} from "./utils/Util.sol"; // Hypothetical utilities for testing
 
 contract ChainIdManagerTest is Test {
     ChainIdManager public chainIdManager;
@@ -29,7 +28,7 @@ contract ChainIdManagerTest is Test {
         uint256 currentGas = gasleft();
         chainIdManager.denyListChainId(2);
         uint256 finalGas = gasleft();
-        assert(currentGas - finalGas >= chainIdManager.gasBurnAmount());
+        assert(currentGas - finalGas >= chainIdManager.GAS_BURN_AMOUNT());
 
         uint256 currentGas2 = gasleft();
         uint64[] memory newChainIds = new uint64[](6);
@@ -41,7 +40,7 @@ contract ChainIdManagerTest is Test {
         newChainIds[5] = 8;
         chainIdManager.denyListChainIds(newChainIds);
         uint256 finalGas2 = gasleft();
-        assert(currentGas2 - finalGas2 >= chainIdManager.gasBurnAmount() * 6);
+        assert(currentGas2 - finalGas2 >= chainIdManager.GAS_BURN_AMOUNT() * 6);
     }
 
     function testAddChainIds() public {
@@ -90,6 +89,8 @@ contract ChainIdManagerTest is Test {
         uint256 initialGasLeft = gasleft();
         chainIdManager.burnGas();
         uint256 finalGasLeft = gasleft();
-        assert(initialGasLeft - finalGasLeft >= chainIdManager.gasBurnAmount());
+        assert(
+            initialGasLeft - finalGasLeft >= chainIdManager.GAS_BURN_AMOUNT()
+        );
     }
 }
diff --git a/test/ForkableBridge.t.sol b/test/ForkableBridge.t.sol
@@ -6,19 +6,14 @@ import {ForkableBridgeWrapper} from "./testcontract/ForkableBridgeWrapper.sol";
 import {ForkonomicToken} from "../contracts/ForkonomicToken.sol";
 import {IForkableBridge} from "../contracts/interfaces/IForkableBridge.sol";
 import {IForkableStructure} from "../contracts/interfaces/IForkableStructure.sol";
-import {IForkonomicToken} from "../contracts/interfaces/IForkonomicToken.sol";
 import {ForkableGlobalExitRoot} from "../contracts/ForkableGlobalExitRoot.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC20Upgradeable.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {PolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {ERC20PresetMinterPauser} from "@openzeppelin/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
-import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
 
 contract ForkableBridgeTest is Test {
     ForkableBridge public forkableBridge;
@@ -315,7 +310,7 @@ contract ForkableBridgeTest is Test {
         address forkableToken = forkableBridge.tokenInfoToWrappedToken(
             tokenInfoHash
         );
-        for (uint i = 0; i < 32; i++) {
+        for (uint256 i = 0; i < 32; i++) {
             depositTreeHashes[i] = forkableBridge.branch(i);
         }
         // initialize the child contracts to set the parent contract

diff --git a/test/ForkableZkEVM.t.sol b/test/ForkableZkEVM.t.sol
@@ -124,7 +124,7 @@ contract ForkableZkEVMTest is Test {
         );
         bytes32 newStateRoot = keccak256(abi.encodePacked("newStateRoot"));
         bytes32[24] memory proof;
-        for (uint i = 0; i < 24; i++) {
+        for (uint256 i = 0; i < 24; i++) {
             proof[i] = bytes32(abi.encodePacked("proof", i));
         }
 
@@ -150,7 +150,7 @@ contract ForkableZkEVMTest is Test {
         forkableZkEVM.consolidatePendingState(10);
 
         bytes32[24] memory proof;
-        for (uint i = 0; i < 24; i++) {
+        for (uint256 i = 0; i < 24; i++) {
             proof[i] = bytes32("0x"); // Whatever initialization value you want
         }
 

diff --git a/test/ForkingManager.t.sol b/test/ForkingManager.t.sol
@@ -14,7 +14,6 @@ import {IPolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts
 import {IForkingManager} from "../contracts/interfaces/IForkingManager.sol";
 import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {PolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC20Upgradeable.sol";
 import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

diff --git a/test/ForkonomicToken.t.sol b/test/ForkonomicToken.t.sol
@@ -4,9 +4,7 @@ import {Test} from "forge-std/Test.sol";
 import {ForkonomicToken} from "../contracts/ForkonomicToken.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC20Upgradeable.sol";
 import {IForkonomicToken} from "../contracts/interfaces/IForkonomicToken.sol";
-import {ForkableBridge} from "../contracts/ForkableBridge.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import {Util} from "./utils/Util.sol";
 
 contract ForkonomicTokenTest is Test {
     ForkonomicToken public forkonomicToken;

diff --git a/test/L1GlobalChainInfoPublisher.t.sol b/test/L1GlobalChainInfoPublisher.t.sol
@@ -3,42 +3,21 @@ pragma solidity ^0.8.20;
 /* solhint-disable not-rely-on-time */
 /* solhint-disable reentrancy */
 /* solhint-disable quotes */
-
-import {Vm} from "forge-std/Vm.sol";
-
+/* solhint-disable not-rely-on-time */
 import {Test} from "forge-std/Test.sol";
-import {Arbitrator} from "../contracts/lib/reality-eth/Arbitrator.sol";
 
 import {VerifierRollupHelperMock} from "@RealityETH/zkevm-contracts/contracts/mocks/VerifierRollupHelperMock.sol";
-import {IRealityETH} from "../contracts/lib/reality-eth/interfaces/IRealityETH.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {ForkableRealityETH_ERC20} from "../contracts/ForkableRealityETH_ERC20.sol";
-import {RealityETH_v3_0} from "../contracts/lib/reality-eth/RealityETH-3.0.sol";
-import {AdjudicationFramework} from "../contracts/AdjudicationFramework.sol";
-
 import {IForkableStructure} from "../contracts/interfaces/IForkableStructure.sol";
-import {L2ForkArbitrator} from "../contracts/L2ForkArbitrator.sol";
 import {L1GlobalChainInfoPublisher} from "../contracts/L1GlobalChainInfoPublisher.sol";
-import {L1GlobalForkRequester} from "../contracts/L1GlobalForkRequester.sol";
 import {L2ChainInfo} from "../contracts/L2ChainInfo.sol";
-
-import {MockPolygonZkEVMBridge} from "./testcontract/MockPolygonZkEVMBridge.sol";
-
-pragma solidity ^0.8.20;
-
-/* solhint-disable not-rely-on-time */
-
-import {Test} from "forge-std/Test.sol";
 import {ForkingManager} from "../contracts/ForkingManager.sol";
 import {ForkableBridge} from "../contracts/ForkableBridge.sol";
 import {ForkableZkEVM} from "../contracts/ForkableZkEVM.sol";
 import {ForkonomicToken} from "../contracts/ForkonomicToken.sol";
 import {ForkableGlobalExitRoot} from "../contracts/ForkableGlobalExitRoot.sol";
-import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMGlobalExitRoot.sol";
 import {IForkingManager} from "../contracts/interfaces/IForkingManager.sol";
 import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {PolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC20Upgradeable.sol";
 import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

diff --git a/test/L1GlobalForkRequester.t.sol b/test/L1GlobalForkRequester.t.sol
@@ -14,7 +14,6 @@ import {IForkingManager} from "../contracts/interfaces/IForkingManager.sol";
 import {IForkonomicToken} from "../contracts/interfaces/IForkonomicToken.sol";
 import {IVerifierRollup} from "@RealityETH/zkevm-contracts/contracts/interfaces/IVerifierRollup.sol";
 import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {PolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC20Upgradeable.sol";
 import {IPolygonZkEVM} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVM.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

diff --git a/test/MoneyBox.t.sol b/test/MoneyBox.t.sol
@@ -4,7 +4,6 @@ import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
 
 import {MoneyBox} from "../contracts/mixin/MoneyBox.sol";
-import {CalculateMoneyBoxAddress} from "../contracts/lib/CalculateMoneyBoxAddress.sol";
 
 import {ExampleToken} from "./testcontract/ExampleToken.sol";
 import {ExampleMoneyBoxUser} from "./testcontract/ExampleMoneyBoxUser.sol";

diff --git a/test/testcontract/ForkableBridgeWrapper.sol b/test/testcontract/ForkableBridgeWrapper.sol
@@ -3,12 +3,6 @@ pragma solidity ^0.8.20;
 import {ForkableBridge} from "../../contracts/ForkableBridge.sol";
 import {IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
 import {PolygonZkEVMBridge, IBasePolygonZkEVMGlobalExitRoot} from "@RealityETH/zkevm-contracts/contracts/inheritedMainContracts/PolygonZkEVMBridge.sol";
-import {IPolygonZkEVMBridge} from "@RealityETH/zkevm-contracts/contracts/interfaces/IPolygonZkEVMBridge.sol";
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {TokenWrapped} from "@RealityETH/zkevm-contracts/contracts/lib/TokenWrapped.sol";
-import {IForkableBridge} from "../../contracts/interfaces/IForkableBridge.sol";
-import {IForkonomicToken} from "../../contracts/interfaces/IForkonomicToken.sol";
 import {ForkableStructure} from "../../contracts/mixin/ForkableStructure.sol";
 
 contract ForkableBridgeWrapper is ForkableBridge {

diff --git a/test/testcontract/ForkableExitMock.sol b/test/testcontract/ForkableExitMock.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.20;
 
-import "../../contracts/ForkableGlobalExitRoot.sol";
+import {ForkableGlobalExitRoot} from "../../contracts/ForkableGlobalExitRoot.sol";
 
 /**
  * Contract responsible for managing the exit roots across multiple networks