clean up

zerodevapp · Dec 6, 2024 · 887a4f4 · 887a4f4
1 parent 5502df2
commit 887a4f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Kernel.sol b/src/Kernel.sol
@@ -19,7 +19,8 @@ import {
 } from "./core/ValidationManager.sol";
 import {IModule, IValidator, IHook, IExecutor, IFallback, IPolicy, ISigner} from "./interfaces/IERC7579Modules.sol";
 import {EIP712} from "solady/utils/EIP712.sol";
-import {ExecLib, ExecMode, CallType, ExecType, ExecModeSelector, ExecModePayload} from "./utils/ExecLib.sol";
+import {ExecLib} from "./utils/ExecLib.sol";
+import {ExecMode, CallType, ExecType, ExecModeSelector, ExecModePayload} from "./types/Types.sol";
 import {
     CALLTYPE_SINGLE,
     CALLTYPE_DELEGATECALL,

diff --git a/src/core/SelectorManager.sol b/src/core/SelectorManager.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 
 import {IHook, IFallback, IModule} from "../interfaces/IERC7579Modules.sol";
 import {IERC7579Account} from "../interfaces/IERC7579Account.sol";
-import {CallType} from "../utils/ExecLib.sol";
+import {CallType} from "../types/Types.sol";
 import {
     SELECTOR_MANAGER_STORAGE_SLOT,
     CALLTYPE_DELEGATECALL,

diff --git a/src/core/ValidationManager.sol b/src/core/ValidationManager.sol
@@ -20,10 +20,9 @@ import {
     PassFlag
 } from "../utils/ValidationTypeLib.sol";
 
-import {CallType} from "../utils/ExecLib.sol";
 import {CALLTYPE_SINGLE, MODULE_TYPE_POLICY, MODULE_TYPE_SIGNER, MODULE_TYPE_VALIDATOR} from "../types/Constants.sol";
 
-import {PermissionId, getValidationResult} from "../types/Types.sol";
+import {PermissionId, getValidationResult, CallType} from "../types/Types.sol";
 import {_intersectValidationData} from "../utils/KernelValidationResult.sol";
 
 import {

diff --git a/src/mock/MockFallback.sol b/src/mock/MockFallback.sol
@@ -3,7 +3,8 @@ pragma solidity ^0.8.0;
 
 import {IERC7579Account} from "../interfaces/IERC7579Account.sol";
 import {IFallback} from "../interfaces/IERC7579Modules.sol";
-import {CallType, ExecType, ExecMode, ExecLib} from "../utils/ExecLib.sol";
+import {CallType, ExecType, ExecMode} from "../types/Types.sol";
+import {ExecLib} from "../utils/ExecLib.sol";
 import {EXEC_MODE_DEFAULT} from "../types/Constants.sol";
 
 contract Callee {