refactor: sort imports

src/account/AccountStorageV1.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.22;
 
 import {IPlugin} from "../interfaces/IPlugin.sol";
 import {FunctionReference} from "../interfaces/IPluginManager.sol";
-
 import {LinkedListSet} from "../libraries/LinkedListSetLib.sol";
 
 /// @title Account Storage V1

src/factory/MultiOwnerMSCAFactory.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
+import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
-import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
-import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
 import {FactoryHelpers} from "../helpers/FactoryHelpers.sol";
+import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
+import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
 
 /// @title Multi Owner Plugin MSCA (Modular Smart Contract Account) Factory
 /// @author Alchemy

src/factory/MultiOwnerTokenReceiverMSCAFactory.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
+import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
-import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
-import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
 import {FactoryHelpers} from "../helpers/FactoryHelpers.sol";
+import {IEntryPoint} from "../interfaces/erc4337/IEntryPoint.sol";
+import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
 
 /// @title Multi Owner Plugin + Token Receiver MSCA (Modular Smart Contract Account) Factory
 /// @author Alchemy

src/helpers/KnownSelectors.sol

@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {UUPSUpgradeable} from "../../ext/UUPSUpgradeable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 import {IAccount} from "../../src/interfaces/erc4337/IAccount.sol";
-import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
-import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol";
-import {IAccountView} from "../../src/interfaces/IAccountView.sol";
 import {IAggregator} from "../../src/interfaces/erc4337/IAggregator.sol";
 import {IPaymaster} from "../../src/interfaces/erc4337/IPaymaster.sol";
+import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol";
+import {IAccountView} from "../../src/interfaces/IAccountView.sol";
+import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
+import {IAccountInitializable} from "../interfaces/IAccountInitializable.sol";
 import {IPlugin} from "../interfaces/IPlugin.sol";
 import {IPluginExecutor} from "../interfaces/IPluginExecutor.sol";
-import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";
 import {IStandardExecutor} from "../interfaces/IStandardExecutor.sol";
 
 /// @title Known Selectors

src/plugins/BasePlugin.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.22;
 
 import {ERC165} from "@openzeppelin/contracts/utils/introspection/ERC165.sol";
 
-import {IPlugin, PluginManifest, PluginMetadata} from "../interfaces/IPlugin.sol";
 import {UserOperation} from "../interfaces/erc4337/UserOperation.sol";
+import {IPlugin, PluginManifest, PluginMetadata} from "../interfaces/IPlugin.sol";
 
 /// @title Base contract for plugins
 /// @dev Implements ERC-165 to support IPlugin's interface, which is a requirement

src/plugins/TokenReceiverPlugin.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/interfaces/IERC1155Receiver.sol";
+import {IERC777Recipient} from "@openzeppelin/contracts/interfaces/IERC777Recipient.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 
 import {
     ManifestFunction,

src/plugins/session/ISessionKeyPlugin.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {Call} from "../../interfaces/IStandardExecutor.sol";
 import {UserOperation} from "../../interfaces/erc4337/UserOperation.sol";
+import {Call} from "../../interfaces/IStandardExecutor.sol";
 
 interface ISessionKeyPlugin {
     enum FunctionId {

src/plugins/session/permissions/SessionKeyPermissions.sol

@@ -3,14 +3,13 @@ pragma solidity ^0.8.22;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
+import {UserOperation} from "../../../interfaces/erc4337/UserOperation.sol";
 import {Call} from "../../../interfaces/IStandardExecutor.sol";
+import {IStandardExecutor} from "../../../interfaces/IStandardExecutor.sol";
 import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol";
 import {ISessionKeyPermissionsUpdates} from "./ISessionKeyPermissionsUpdates.sol";
 import {SessionKeyPermissionsLoupe} from "./SessionKeyPermissionsLoupe.sol";
 
-import {IStandardExecutor} from "../../../interfaces/IStandardExecutor.sol";
-import {UserOperation} from "../../../interfaces/erc4337/UserOperation.sol";
-
 /// @title Session Key Permissions
 /// @author Alchemy
 /// @notice This plugin allows users to configure and enforce permissions on session keys that have been

src/plugins/session/permissions/SessionKeyPermissionsBase.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol";
-
 import {PluginStorageLib, StoragePointer} from "../../../libraries/PluginStorageLib.sol";
+import {ISessionKeyPlugin} from "../ISessionKeyPlugin.sol";
 
 abstract contract SessionKeyPermissionsBase is ISessionKeyPlugin {
     type SessionKeyId is bytes32;

test/account/AccountReturnData.t.sol

@@ -6,17 +6,16 @@ import {Test} from "forge-std/Test.sol";
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {FunctionReference} from "../../src/interfaces/IPluginManager.sol";
-import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {Call} from "../../src/interfaces/IStandardExecutor.sol";
-
+import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {
     RegularResultContract,
     ResultCreatorPlugin,
     ResultConsumerPlugin
 } from "../mocks/plugins/ReturnDataPluginMocks.sol";
-import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 
 // Tests all the different ways that return data can be read from plugins through an account
 contract AccountReturnDataTest is Test {

test/account/ExecuteFromPluginPermissions.t.sol

@@ -5,23 +5,20 @@ import {Test, console} from "forge-std/Test.sol";
 
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 
-import {IPlugin} from "../../src/interfaces/IPlugin.sol";
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
+import {IPlugin} from "../../src/interfaces/IPlugin.sol";
 import {FunctionReference} from "../../src/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
-
-import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
-
 import {Counter} from "../mocks/Counter.sol";
-import {ResultCreatorPlugin} from "../mocks/plugins/ReturnDataPluginMocks.sol";
-
 import {
     EFPCallerPlugin,
     EFPCallerPluginAnyExternal,
     EFPCallerPluginAnyExternalCanSpendNativeToken,
     EFPExecutionHookPlugin
 } from "../mocks/plugins/ExecFromPluginPermissionsMocks.sol";
+import {ResultCreatorPlugin} from "../mocks/plugins/ReturnDataPluginMocks.sol";
 
 contract ExecuteFromPluginPermissionsTest is Test {
     Counter public counter1;

test/account/ManifestValidity.t.sol

@@ -5,13 +5,12 @@ import {Test} from "forge-std/Test.sol";
 
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {FunctionReference} from "../../src/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
-
-import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {
     BadValidationMagicValue_UserOp_Plugin,
     BadValidationMagicValue_PreRuntimeValidationHook_Plugin,

test/account/UpgradeableModularAccount.t.sol

@@ -10,19 +10,18 @@ import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.so
 import {AccountExecutor} from "../../src/account/AccountExecutor.sol";
 import {PluginManagerInternals} from "../../src/account/PluginManagerInternals.sol";
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
-import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol";
-import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
-import {SessionKeyPlugin} from "../../src/plugins/session/SessionKeyPlugin.sol";
-import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";
+import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol";
 import {IAccountInitializable} from "../../src/interfaces/IAccountInitializable.sol";
 import {IPlugin, PluginManifest} from "../../src/interfaces/IPlugin.sol";
 import {FunctionReference, IPluginManager} from "../../src/interfaces/IPluginManager.sol";
 import {Call} from "../../src/interfaces/IStandardExecutor.sol";
-
+import {IMultiOwnerPlugin} from "../../src/plugins/owner/IMultiOwnerPlugin.sol";
+import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
+import {SessionKeyPlugin} from "../../src/plugins/session/SessionKeyPlugin.sol";
+import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";
 import {Counter} from "../mocks/Counter.sol";
-import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {MockPlugin} from "../mocks/MockPlugin.sol";
 
 contract UpgradeableModularAccountTest is Test {

test/account/ValidationIntersection.t.sol

@@ -6,12 +6,11 @@ import {Test} from "forge-std/Test.sol";
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 
 import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
+import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol";
 import {FunctionReference} from "../../src/interfaces/IPluginManager.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
-
-import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {
     MockBaseUserOpValidationPlugin,
     MockUserOpValidation1HookPlugin,

test/account/phases/AccountStatePhasesExec.t.sol

@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol";
-
-import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol";
 import {
     IPlugin,
     PluginManifest,
@@ -12,10 +9,11 @@ import {
     ManifestAssociatedFunctionType,
     ManifestFunction
 } from "../../../src/interfaces/IPlugin.sol";
+import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol";
 import {IStandardExecutor, Call} from "../../../src/interfaces/IStandardExecutor.sol";
-
-import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol";
 import {MockPlugin} from "../../mocks/MockPlugin.sol";
+import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol";
+import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol";
 
 // Tests the account state phase behavior when the source of the state modification happens during execution.
 contract AccountStatePhasesUOValidationTest is AccountStatePhasesTest {

test/account/phases/AccountStatePhasesRTValidation.t.sol

@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol";
-
-import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol";
+import {UpgradeableModularAccount} from "../../../src/account/UpgradeableModularAccount.sol";
 import {IPlugin} from "../../../src/interfaces/IPlugin.sol";
+import {IPluginManager} from "../../../src/interfaces/IPluginManager.sol";
 import {IStandardExecutor, Call} from "../../../src/interfaces/IStandardExecutor.sol";
-import {UpgradeableModularAccount} from "../../../src/account/UpgradeableModularAccount.sol";
-
 import {AccountStateMutatingPlugin} from "../../mocks/plugins/AccountStateMutatingPlugin.sol";
+import {AccountStatePhasesTest} from "./AccountStatePhases.t.sol";
 
 // Tests the account state phase behavior when the source of the state modification
 // happens during runtime validation.

test/comparison/CompareSimpleAccount.t.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
 
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 import {SimpleAccount} from "@eth-infinitism/account-abstraction/samples/SimpleAccount.sol";
 import {SimpleAccountFactory} from "@eth-infinitism/account-abstraction/samples/SimpleAccountFactory.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {UserOperation} from "../../src/interfaces/erc4337/UserOperation.sol";

test/factory/MultiOwnerMSCAFactoryTest.t.sol

@@ -6,10 +6,10 @@ import {Test} from "forge-std/Test.sol";
 import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerMSCAFactory} from "../../src/factory/MultiOwnerMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 
 contract MultiOwnerMSCAFactoryTest is Test {
     using ECDSA for bytes32;

test/factory/MultiOwnerTokenReceiverFactoryTest.t.sol

@@ -3,18 +3,18 @@ pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
 
-import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {ERC721PresetMinterPauserAutoId} from
     "@openzeppelin/contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoId.sol";
+import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
+import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
 import {MultiOwnerTokenReceiverMSCAFactory} from "../../src/factory/MultiOwnerTokenReceiverMSCAFactory.sol";
 import {IEntryPoint} from "../../src/interfaces/erc4337/IEntryPoint.sol";
 import {MultiOwnerPlugin} from "../../src/plugins/owner/MultiOwnerPlugin.sol";
 import {TokenReceiverPlugin} from "../../src/plugins/TokenReceiverPlugin.sol";
-import {UpgradeableModularAccount} from "../../src/account/UpgradeableModularAccount.sol";
-import {MockERC777} from "../mocks/tokens/MockERC777.sol";
 import {MockERC1155} from "../mocks/tokens/MockERC1155.sol";
+import {MockERC777} from "../mocks/tokens/MockERC777.sol";
 
 contract MultiOwnerTokenReceiverMSCAFactoryTest is Test {
     using ECDSA for bytes32;

test/helpers/KnownSelectors.t.sol

@@ -3,15 +3,15 @@ pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
 
-import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import {BaseAccount} from "@eth-infinitism/account-abstraction/core/BaseAccount.sol";
 import {IAggregator} from "@eth-infinitism/account-abstraction/interfaces/IAggregator.sol";
 import {IPaymaster} from "@eth-infinitism/account-abstraction/interfaces/IPaymaster.sol";
+import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 import {KnownSelectors} from "../../src/helpers/KnownSelectors.sol";
-import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol";
 import {IAccountInitializable} from "../../src/interfaces/IAccountInitializable.sol";
+import {IAccountLoupe} from "../../src/interfaces/IAccountLoupe.sol";
 import {IPlugin} from "../../src/interfaces/IPlugin.sol";
 import {IPluginExecutor} from "../../src/interfaces/IPluginExecutor.sol";
 import {IPluginManager} from "../../src/interfaces/IPluginManager.sol";

test/invariant/LLSLRepro.t.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
 
-import {LinkedListSetHandler} from "./handlers/LinkedListSetHandler.sol";
 import {AssociatedLinkedListSetHandler} from "./handlers/AssociatedLinkedListSetHandler.sol";
+import {LinkedListSetHandler} from "./handlers/LinkedListSetHandler.sol";
 
 contract LLSLReproTest is Test {
     LinkedListSetHandler public handler;

test/invariant/handlers/AssociatedLinkedListSetHandler.sol

@@ -5,8 +5,9 @@ import {CommonBase} from "forge-std/Base.sol";
 import {StdCheats} from "forge-std/StdCheats.sol";
 import {StdUtils} from "forge-std/StdUtils.sol";
 
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+
 import {
     AssociatedLinkedListSet,
     AssociatedLinkedListSetLib

test/invariant/handlers/LinkedListSetHandler.sol

@@ -5,8 +5,9 @@ import {CommonBase} from "forge-std/Base.sol";
 import {StdCheats} from "forge-std/StdCheats.sol";
 import {StdUtils} from "forge-std/StdUtils.sol";
 
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+
 import {LinkedListSetLib, LinkedListSet as EnumerableSetType} from "../../../src/libraries/LinkedListSetLib.sol";
 import {SetValue} from "../../../src/libraries/LinkedListSetUtils.sol";
 

test/mocks/ContractOwner.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.22;
 
-import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-
 import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
 contract ContractOwner is IERC1271 {
     bytes4 internal constant _1271_MAGIC_VALUE = 0x1626ba7e;

test/mocks/Counter.t.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
+
 import {Counter} from "./Counter.sol";
 
 contract CounterTest is Test {