Skip to content

Commit

Permalink
fix: use relative imports
Browse files Browse the repository at this point in the history
  • Loading branch information
highskore committed Nov 28, 2024
1 parent 914bd27 commit 5f38b07
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 31 deletions.
5 changes: 3 additions & 2 deletions src/Accounts.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
pragma solidity >=0.8.23 <0.9.0;

/* solhint-disable no-unused-import */
import { Execution, ExecutionLib } from "src/accounts/erc7579/lib/ExecutionLib.sol";
import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";

import { Execution, ExecutionLib } from "./accounts/erc7579/lib/ExecutionLib.sol";
import { IERC7579Account } from "./accounts/common/interfaces/IERC7579Account.sol";
9 changes: 5 additions & 4 deletions src/Interfaces.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ pragma solidity >=0.8.23 <0.9.0;
/*//////////////////////////////////////////////////////////////
ERCs
//////////////////////////////////////////////////////////////*/
import { IERC1271, EIP1271_MAGIC_VALUE } from "src/module-bases/interfaces/IERC1271.sol";
import { IERC7484 } from "src/module-bases/interfaces/IERC7484.sol";

import { IERC1271, EIP1271_MAGIC_VALUE } from "./module-bases/interfaces/IERC1271.sol";
import { IERC7484 } from "./module-bases/interfaces/IERC7484.sol";

/*//////////////////////////////////////////////////////////////
Modules
//////////////////////////////////////////////////////////////*/
import { IStatelessValidator } from "src/module-bases/interfaces/IStatelessValidator.sol";
import { IStatelessValidator } from "./module-bases/interfaces/IStatelessValidator.sol";

/*//////////////////////////////////////////////////////////////
Misc
Expand All @@ -21,4 +22,4 @@ import {
IERC6682,
IERC3156FlashLender,
IERC3156FlashBorrower
} from "src/module-bases/interfaces/Flashloan.sol";
} from "./module-bases/interfaces/Flashloan.sol";
20 changes: 10 additions & 10 deletions src/Mocks.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ pragma solidity >=0.8.23 <0.9.0;
Aux
//////////////////////////////////////////////////////////////*/

import { MockRegistry } from "src/module-bases/mocks/MockRegistry.sol";
import { MockTarget } from "src/module-bases/mocks/MockTarget.sol";
import { MockHookMultiPlexer } from "src/module-bases/mocks/MockHookMultiPlexer.sol";
import { MockPolicy } from "src/module-bases/mocks/MockPolicy.sol";
import { MockRegistry } from "./module-bases/mocks/MockRegistry.sol";
import { MockTarget } from "./module-bases/mocks/MockTarget.sol";
import { MockHookMultiPlexer } from "./module-bases/mocks/MockHookMultiPlexer.sol";
import { MockPolicy } from "./module-bases/mocks/MockPolicy.sol";

/*//////////////////////////////////////////////////////////////
Modules
//////////////////////////////////////////////////////////////*/

import { MockValidator } from "src/module-bases/mocks/MockValidator.sol";
import { MockStatelessValidator } from "src/module-bases/mocks/MockStatelessValidator.sol";
import { MockHybridValidator } from "src/module-bases/mocks/MockHybridValidator.sol";
import { MockExecutor } from "src/module-bases/mocks/MockExecutor.sol";
import { MockHook } from "src/module-bases/mocks/MockHook.sol";
import { MockFallback } from "src/module-bases/mocks/MockFallback.sol";
import { MockValidator } from "./module-bases/mocks/MockValidator.sol";
import { MockStatelessValidator } from "./module-bases/mocks/MockStatelessValidator.sol";
import { MockHybridValidator } from "./module-bases/mocks/MockHybridValidator.sol";
import { MockExecutor } from "./module-bases/mocks/MockExecutor.sol";
import { MockHook } from "./module-bases/mocks/MockHook.sol";
import { MockFallback } from "./module-bases/mocks/MockFallback.sol";

/*//////////////////////////////////////////////////////////////
Tokens
Expand Down
30 changes: 15 additions & 15 deletions src/Modules.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
pragma solidity >=0.8.23 <0.9.0;

/* solhint-disable no-unused-import */
import { ERC7579ValidatorBase } from "src/module-bases/ERC7579ValidatorBase.sol";
import { ERC7579StatelessValidatorBase } from "src/module-bases/ERC7579StatelessValidatorBase.sol";
import { ERC7579ExecutorBase } from "src/module-bases/ERC7579ExecutorBase.sol";
import { ERC7579HookBase } from "src/module-bases/ERC7579HookBase.sol";
import { ERC7579HookDestruct } from "src/module-bases/ERC7579HookDestruct.sol";
import { ERC7579FallbackBase } from "src/module-bases/ERC7579FallbackBase.sol";
import { SchedulingBase } from "src/module-bases/SchedulingBase.sol";
import { ERC7579ValidatorBase } from "./module-bases/ERC7579ValidatorBase.sol";
import { ERC7579StatelessValidatorBase } from "./module-bases/ERC7579StatelessValidatorBase.sol";
import { ERC7579ExecutorBase } from "./module-bases/ERC7579ExecutorBase.sol";
import { ERC7579HookBase } from "./module-bases/ERC7579HookBase.sol";
import { ERC7579HookDestruct } from "./module-bases/ERC7579HookDestruct.sol";
import { ERC7579FallbackBase } from "./module-bases/ERC7579FallbackBase.sol";
import { SchedulingBase } from "./module-bases/SchedulingBase.sol";
import {
IValidator as IERC7579Validator,
IExecutor as IERC7579Executor,
IFallback as IERC7579Fallback,
IHook as IERC7579Hook
} from "src/accounts/common/interfaces/IERC7579Module.sol";
import { ERC7484RegistryAdapter } from "src/module-bases/ERC7484RegistryAdapter.sol";
import { ERC7579ModuleBase } from "src/module-bases/ERC7579ModuleBase.sol";
import { TrustedForwarder } from "src/module-bases/utils/TrustedForwarder.sol";
import { ERC1271Policy } from "src/module-bases/ERC1271Policy.sol";
import { ERC7579ActionPolicy } from "src/module-bases/ERC7579ActionPolicy.sol";
import { ERC7579PolicyBase } from "src/module-bases/ERC7579PolicyBase.sol";
import { ERC7579UserOpPolicy } from "src/module-bases/ERC7579UserOpPolicy.sol";
} from "./accounts/common/interfaces/IERC7579Module.sol";
import { ERC7484RegistryAdapter } from "./module-bases/ERC7484RegistryAdapter.sol";
import { ERC7579ModuleBase } from "./module-bases/ERC7579ModuleBase.sol";
import { TrustedForwarder } from "./module-bases/utils/TrustedForwarder.sol";
import { ERC1271Policy } from "./module-bases/ERC1271Policy.sol";
import { ERC7579ActionPolicy } from "./module-bases/ERC7579ActionPolicy.sol";
import { ERC7579PolicyBase } from "./module-bases/ERC7579PolicyBase.sol";
import { ERC7579UserOpPolicy } from "./module-bases/ERC7579UserOpPolicy.sol";

0 comments on commit 5f38b07

Please sign in to comment.