Skip to content

Commit

Permalink
👷🏻 🧹 Move MockAccount into test utils
Browse files Browse the repository at this point in the history
  • Loading branch information
tommyrharper committed Jul 16, 2024
1 parent 8b65fba commit 73cc4d2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion src/MarginPaymaster.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {IPaymaster, UserOperation} from "lib/account-abstraction/contracts/inter
import {IPerpsMarketProxy} from "src/interfaces/external/IPerpsMarketProxy.sol";
import {IV3SwapRouter} from "src/interfaces/external/IV3SwapRouter.sol";
import {IWETH9} from "src/interfaces/external/IWETH9.sol";
import {MockAccount} from "src/MockAccount.sol";
import {Zap} from "lib/zap/src/Zap.sol";
import {OracleLibrary} from "src/libraries/OracleLibrary.sol";
import {IUniswapV3Pool} from "src/interfaces/external/IUniswapV3Pool.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/MarginPaymaster.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.20;

import {Bootstrap} from "test/utils/Bootstrap.sol";
import {EntryPoint, UserOperation} from "lib/account-abstraction/contracts/core/EntryPoint.sol";
import {AccountFactory, MockAccount} from "src/MockAccount.sol";
import {AccountFactory, MockAccount} from "test/utils/MockAccount.sol";
import {MarginPaymaster, IPaymaster} from "src/MarginPaymaster.sol";
import {IStakeManager} from "lib/account-abstraction/contracts/interfaces/IStakeManager.sol";
import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/utils/Bootstrap.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {MarginPaymaster, OptimismGoerliParameters, OptimismParameters, BaseParam
import {IPerpsMarketProxy} from "src/interfaces/external/IPerpsMarketProxy.sol";
import {IV3SwapRouter} from "src/interfaces/external/IV3SwapRouter.sol";
import {IWETH9} from "src/interfaces/external/IWETH9.sol";
import {AccountFactory, MockAccount} from "src/MockAccount.sol";
import {AccountFactory, MockAccount} from "test/utils/MockAccount.sol";
import {IUSDC} from "test/utils/interfaces/IUSDC.sol";
import {Test} from "lib/forge-std/src/Test.sol";
import {console} from "lib/forge-std/src/console.sol";
Expand Down
File renamed without changes.

0 comments on commit 73cc4d2

Please sign in to comment.