🎨 foundry: sort imports

exactly · May 17, 2024 · a899d77 · a899d77
1 parent abdcc07
commit a899d77
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -8,6 +8,7 @@ isolate = true
 
 [fmt]
 tab_width = 2
+sort_imports = true
 bracket_spacing = true
 number_underscore = "thousands"
 

diff --git a/src/WebauthnModularAccountFactory.sol b/src/WebauthnModularAccountFactory.sol
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.8.0;
 
-import { Ownable2Step, Ownable } from "openzeppelin-contracts/contracts/access/Ownable2Step.sol";
+import { Ownable, Ownable2Step } from "openzeppelin-contracts/contracts/access/Ownable2Step.sol";
 
 import { FactoryHelpers } from "modular-account/src/helpers/FactoryHelpers.sol";
-import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
 import { IAccountInitializable } from "modular-account/src/interfaces/IAccountInitializable.sol";
+import { IEntryPoint } from "modular-account/src/interfaces/erc4337/IEntryPoint.sol";
 
 import { LibClone } from "solady/utils/LibClone.sol";
 import { SafeTransferLib } from "solady/utils/SafeTransferLib.sol";
 
+import { IMultiOwnerPlugin, IWebauthnOwnerPlugin, PublicKey } from "./IWebauthnOwnerPlugin.sol";
 import { OwnersLib } from "./OwnersLib.sol";
-import { IWebauthnOwnerPlugin, IMultiOwnerPlugin, PublicKey } from "./IWebauthnOwnerPlugin.sol";
 
 /// @title Webauthn Owner Plugin Modular Account Factory
 /// @author Exactly

diff --git a/src/WebauthnOwnerPlugin.sol b/src/WebauthnOwnerPlugin.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity ^0.8.18;
 
-import { UpgradeableModularAccount, UUPSUpgradeable } from "modular-account/src/account/UpgradeableModularAccount.sol";
+import { UUPSUpgradeable, UpgradeableModularAccount } from "modular-account/src/account/UpgradeableModularAccount.sol";
 
 import {
   ManifestAssociatedFunction,
@@ -13,7 +13,7 @@ import {
 } from "modular-account-libs/interfaces/IPlugin.sol";
 import { IStandardExecutor } from "modular-account-libs/interfaces/IStandardExecutor.sol";
 import { UserOperation } from "modular-account-libs/interfaces/UserOperation.sol";
-import { SIG_VALIDATION_PASSED, SIG_VALIDATION_FAILED } from "modular-account-libs/libraries/Constants.sol";
+import { SIG_VALIDATION_FAILED, SIG_VALIDATION_PASSED } from "modular-account-libs/libraries/Constants.sol";
 import { BasePlugin } from "modular-account-libs/plugins/BasePlugin.sol";
 
 import { IERC1271 } from "openzeppelin-contracts/contracts/interfaces/IERC1271.sol";
@@ -23,8 +23,8 @@ import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
 
 import { WebAuthn } from "webauthn-sol/WebAuthn.sol";
 
-import { OwnersLib, Owners } from "./OwnersLib.sol";
-import { IWebauthnOwnerPlugin, IMultiOwnerPlugin, PublicKey, SignatureWrapper } from "./IWebauthnOwnerPlugin.sol";
+import { IMultiOwnerPlugin, IWebauthnOwnerPlugin, PublicKey, SignatureWrapper } from "./IWebauthnOwnerPlugin.sol";
+import { Owners, OwnersLib } from "./OwnersLib.sol";
 
 contract WebauthnOwnerPlugin is BasePlugin, IWebauthnOwnerPlugin, IERC1271 {
   using SignatureCheckerLib for address;

diff --git a/test/WebauthnModularAccountFactory.t.sol b/test/WebauthnModularAccountFactory.t.sol
@@ -10,10 +10,10 @@ import { UpgradeableModularAccount } from "modular-account/src/account/Upgradeab
 
 import { ECDSA } from "solady/utils/ECDSA.sol";
 
-import { OwnersLib } from "../src/OwnersLib.sol";
 import { DeployScript } from "../script/Deploy.s.sol";
+import { OwnersLib } from "../src/OwnersLib.sol";
 import { WebauthnModularAccountFactory } from "../src/WebauthnModularAccountFactory.sol";
-import { WebauthnOwnerPlugin, IWebauthnOwnerPlugin, IMultiOwnerPlugin, PublicKey } from "../src/WebauthnOwnerPlugin.sol";
+import { IMultiOwnerPlugin, IWebauthnOwnerPlugin, PublicKey, WebauthnOwnerPlugin } from "../src/WebauthnOwnerPlugin.sol";
 
 // solhint-disable func-name-mixedcase
 contract WebauthnModularAccountFactoryTest is Test {

diff --git a/test/WebauthnOwnerPlugin.t.sol b/test/WebauthnOwnerPlugin.t.sol
@@ -15,12 +15,12 @@ import { UserOperation } from "modular-account-libs/interfaces/UserOperation.sol
 
 import { ECDSA } from "solady/utils/ECDSA.sol";
 
-import { WebAuthn } from "webauthn-sol/WebAuthn.sol";
 import { Utils, WebAuthnInfo } from "webauthn-sol/../test/Utils.sol";
+import { WebAuthn } from "webauthn-sol/WebAuthn.sol";
 
 import { DeployScript } from "../script/Deploy.s.sol";
 import { OwnersLib } from "../src/OwnersLib.sol";
-import { WebauthnOwnerPlugin, IWebauthnOwnerPlugin, PublicKey, SignatureWrapper } from "../src/WebauthnOwnerPlugin.sol";
+import { IWebauthnOwnerPlugin, PublicKey, SignatureWrapper, WebauthnOwnerPlugin } from "../src/WebauthnOwnerPlugin.sol";
 
 import { TestLib } from "./utils/TestLib.sol";
 

diff --git a/test/WebauthnPluginIntegration.t.sol b/test/WebauthnPluginIntegration.t.sol
@@ -19,7 +19,7 @@ import { ECDSA } from "solady/utils/ECDSA.sol";
 import { DeployScript } from "../script/Deploy.s.sol";
 import { OwnersLib } from "../src/OwnersLib.sol";
 import { WebauthnModularAccountFactory } from "../src/WebauthnModularAccountFactory.sol";
-import { WebauthnOwnerPlugin, SignatureWrapper } from "../src/WebauthnOwnerPlugin.sol";
+import { SignatureWrapper, WebauthnOwnerPlugin } from "../src/WebauthnOwnerPlugin.sol";
 
 import { TestLib } from "./utils/TestLib.sol";