From 73cc4d24e3b40e8a396d93a1ef24f63c7271602f Mon Sep 17 00:00:00 2001
From: tommyrharper <thomasrobertharper@gmail.com>
Date: Tue, 16 Jul 2024 17:59:02 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=F0=9F=8F=BB=20=F0=9F=A7=B9=20Move?=
 =?UTF-8?q?=20MockAccount=20into=20test=20utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MarginPaymaster.sol             | 1 -
 test/MarginPaymaster.t.sol          | 2 +-
 test/utils/Bootstrap.sol            | 2 +-
 {src => test/utils}/MockAccount.sol | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename {src => test/utils}/MockAccount.sol (100%)

diff --git a/src/MarginPaymaster.sol b/src/MarginPaymaster.sol
index 98944fb..34ced0e 100644
--- a/src/MarginPaymaster.sol
+++ b/src/MarginPaymaster.sol
@@ -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";
diff --git a/test/MarginPaymaster.t.sol b/test/MarginPaymaster.t.sol
index e5e4468..6f647f6 100644
--- a/test/MarginPaymaster.t.sol
+++ b/test/MarginPaymaster.t.sol
@@ -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";
diff --git a/test/utils/Bootstrap.sol b/test/utils/Bootstrap.sol
index 37ced7f..bce3e65 100644
--- a/test/utils/Bootstrap.sol
+++ b/test/utils/Bootstrap.sol
@@ -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";
diff --git a/src/MockAccount.sol b/test/utils/MockAccount.sol
similarity index 100%
rename from src/MockAccount.sol
rename to test/utils/MockAccount.sol