fix: use relative imports

rhinestonewtf · Nov 28, 2024 · 914bd27 · 914bd27
1 parent 349b538
commit 914bd27
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 24 deletions.
diff --git a/src/module-bases/ERC7579ExecutorBase.sol b/src/module-bases/ERC7579ExecutorBase.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IExecutor as IERC7579Executor } from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
+import { IExecutor as IERC7579Executor } from "../accounts/common/interfaces/IERC7579Module.sol";
+import { IERC7579Account } from "../accounts/common/interfaces/IERC7579Account.sol";
 import {
     Execution,
     ExecutionLib as ERC7579ExecutionLib
-} from "src/accounts/erc7579/lib/ExecutionLib.sol";
+} from "../accounts/erc7579/lib/ExecutionLib.sol";
 import {
     ModeCode,
     ModeLib as ERC7579ModeLib,
@@ -18,7 +18,7 @@ import {
     EXECTYPE_DEFAULT,
     MODE_DEFAULT,
     CALLTYPE_DELEGATECALL
-} from "src/accounts/common/lib/ModeLib.sol";
+} from "../accounts/common/lib/ModeLib.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 
 abstract contract ERC7579ExecutorBase is IERC7579Executor, ERC7579ModuleBase {

diff --git a/src/module-bases/ERC7579FallbackBase.sol b/src/module-bases/ERC7579FallbackBase.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IFallback as IERC7579Fallback } from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IFallback as IERC7579Fallback } from "../accounts/common/interfaces/IERC7579Module.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 
 abstract contract ERC7579FallbackBase is IERC7579Fallback, ERC7579ModuleBase {

diff --git a/src/module-bases/ERC7579HookBase.sol b/src/module-bases/ERC7579HookBase.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IHook as IERC7579Hook } from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IHook as IERC7579Hook } from "../accounts/common/interfaces/IERC7579Module.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 import { TrustedForwarder } from "./utils/TrustedForwarder.sol";
 

diff --git a/src/module-bases/ERC7579HookDestruct.sol b/src/module-bases/ERC7579HookDestruct.sol
@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
-import { IHook as IERC7579Hook } from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { ExecutionLib, Execution } from "src/accounts/erc7579/lib/ExecutionLib.sol";
+import { IERC7579Account } from "../accounts/common/interfaces/IERC7579Account.sol";
+import { IHook as IERC7579Hook } from "../accounts/common/interfaces/IERC7579Module.sol";
+import { ExecutionLib, Execution } from "../accounts/erc7579/lib/ExecutionLib.sol";
 import {
     ModeLib,
     CallType,
     ModeCode,
     CALLTYPE_SINGLE,
     CALLTYPE_BATCH,
     CALLTYPE_DELEGATECALL
-} from "src/accounts/common/lib/ModeLib.sol";
-import { IAccountExecute } from "src/external/ERC4337.sol";
+} from "../accounts/common/lib/ModeLib.sol";
+import { IAccountExecute } from "../external/ERC4337.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 import { TrustedForwarder } from "./utils/TrustedForwarder.sol";
 

diff --git a/src/module-bases/ERC7579HybridValidatorBase.sol b/src/module-bases/ERC7579HybridValidatorBase.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import {
     PackedUserOperation,
     _packValidationData as _packValidationData4337
-} from "src/external/ERC4337.sol";
+} from "../external/ERC4337.sol";
 import { ERC7579ValidatorBase } from "./ERC7579ValidatorBase.sol";
 import { ERC7579StatelessValidatorBase } from "./ERC7579StatelessValidatorBase.sol";
 

diff --git a/src/module-bases/ERC7579ModuleBase.sol b/src/module-bases/ERC7579ModuleBase.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IModule as IERC7579Module } from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IModule as IERC7579Module } from "../accounts/common/interfaces/IERC7579Module.sol";
 
 abstract contract ERC7579ModuleBase is IERC7579Module {
     uint256 internal constant TYPE_VALIDATOR = 1;

diff --git a/src/module-bases/ERC7579UserOpPolicy.sol b/src/module-bases/ERC7579UserOpPolicy.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { ERC7579PolicyBase } from "./ERC7579PolicyBase.sol";
 import { ConfigId, IUserOpPolicy } from "./interfaces/IPolicy.sol";
-import { PackedUserOperation } from "src/external/ERC4337.sol";
+import { PackedUserOperation } from "../external/ERC4337.sol";
 
 abstract contract ERC7579UserOpPolicy is ERC7579PolicyBase, IUserOpPolicy {
     function checkUserOp(

diff --git a/src/module-bases/ERC7579ValidatorBase.sol b/src/module-bases/ERC7579ValidatorBase.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import {
     PackedUserOperation,
     _packValidationData as _packValidationData4337
-} from "src/external/ERC4337.sol";
+} from "../external/ERC4337.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 
 abstract contract ERC7579ValidatorBase is ERC7579ModuleBase {

diff --git a/src/module-bases/ERC7579ValidatorMaster.sol b/src/module-bases/ERC7579ValidatorMaster.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import {
     PackedUserOperation,
     _packValidationData as _packValidationData4337
-} from "src/external/ERC4337.sol";
+} from "../external/ERC4337.sol";
 import { ERC7579ModuleBase } from "./ERC7579ModuleBase.sol";
 
 abstract contract ERC7579ValidatorBase is ERC7579ModuleBase {

diff --git a/src/module-bases/interfaces/IPolicy.sol b/src/module-bases/interfaces/IPolicy.sol
@@ -2,12 +2,12 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 // solhint-disable no-unused-import
-import { PackedUserOperation, _packValidationData } from "src/external/ERC4337.sol";
+import { PackedUserOperation, _packValidationData } from "../../external/ERC4337.sol";
 import {
     IModule as IERC7579Module,
     VALIDATION_SUCCESS,
     VALIDATION_FAILED
-} from "src/accounts/common/interfaces/IERC7579Module.sol";
+} from "../../accounts/common/interfaces/IERC7579Module.sol";
 import { IERC165 } from "forge-std/interfaces/IERC165.sol";
 
 type ConfigId is bytes32;

diff --git a/src/module-bases/mocks/MockExecutor.sol b/src/module-bases/mocks/MockExecutor.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import { ERC7579ExecutorBase } from "../ERC7579ExecutorBase.sol";
 // solhint-disable-next-line no-unused-import
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
+import { IERC7579Account } from "../../accounts/common/interfaces/IERC7579Account.sol";
 
 contract MockExecutor is ERC7579ExecutorBase {
     function onInstall(bytes calldata data) external override { }

diff --git a/src/module-bases/mocks/MockHybridValidator.sol b/src/module-bases/mocks/MockHybridValidator.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import { ERC7579HybridValidatorBase } from "../ERC7579HybridValidatorBase.sol";
-import { PackedUserOperation } from "src/external/ERC4337.sol";
+import { PackedUserOperation } from "../../external/ERC4337.sol";
 
 contract MockHybridValidator is ERC7579HybridValidatorBase {
     function onInstall(bytes calldata data) external virtual override { }

diff --git a/src/module-bases/mocks/MockValidator.sol b/src/module-bases/mocks/MockValidator.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 /* solhint-disable no-unused-vars */
 import { ERC7579ValidatorBase } from "../ERC7579ValidatorBase.sol";
-import { PackedUserOperation } from "src/external/ERC4337.sol";
+import { PackedUserOperation } from "../../external/ERC4337.sol";
 
 contract MockValidator is ERC7579ValidatorBase {
     function onInstall(bytes calldata data) external virtual override { }

diff --git a/src/module-bases/utils/ERC7579ValidatorLib.sol b/src/module-bases/utils/ERC7579ValidatorLib.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 // solhint-disable-next-line no-unused-import
-import { IERC7579Account, Execution } from "src/accounts/common/interfaces/IERC7579Account.sol";
-import { PackedUserOperation, UserOperationLib } from "src/external/ERC4337.sol";
+import { IERC7579Account, Execution } from "../../accounts/common/interfaces/IERC7579Account.sol";
+import { PackedUserOperation, UserOperationLib } from "../../external/ERC4337.sol";
 
 enum ACCOUNT_EXEC_TYPE {
     EXEC_SINGLE,

diff --git a/test/mocks/MockK1ValidatorUncompliantUninstall.sol b/test/mocks/MockK1ValidatorUncompliantUninstall.sol
@@ -47,7 +47,7 @@ contract MockK1ValidatorUncompliantUninstall is IValidator {
         smartAccountOwners[msg.sender] = owner;
     }
 
-    function onUninstall(bytes calldata data) external {
+    function onUninstall(bytes calldata data) external pure {
         data;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ contract MockK1ValidatorUncompliantUninstall is IValidator { @@
             smartAccountOwners[msg.sender] = owner;
         }
-        function onUninstall(bytes calldata data) external {
+        function onUninstall(bytes calldata data) external pure {
             data;
         }
@@ Expand Down @@