refactor: remove a few more ep references (#218)

Author: huaweigu

test/comparison/CompareSimpleAccount.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interfaces/PackedUserOperation.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
@@ -12,12 +12,13 @@ import {SimpleAccount} from "@eth-infinitism/account-abstraction/samples/SimpleA
 import {SimpleAccountFactory} from "@eth-infinitism/account-abstraction/samples/SimpleAccountFactory.sol";
 
 import {Counter} from "../mocks/Counter.sol";
+import {EntryPointUtils} from "../utils/EntryPointUtils.sol";
 
-contract CompareSimpleAccountTest is Test {
+contract CompareSimpleAccountTest is Test, EntryPointUtils {
     using ECDSA for bytes32;
     using MessageHashUtils for bytes32;
 
-    EntryPoint public entryPoint;
+    IEntryPoint public entryPoint;
     address payable public beneficiary;
 
     SimpleAccountFactory public factory;
@@ -43,7 +44,7 @@ contract CompareSimpleAccountTest is Test {
     }
 
     function setUp() public {
-        entryPoint = new EntryPoint();
+        entryPoint = _deployEntryPoint();
         (owner1, owner1Key) = makeAddrAndKey("owner1");
         beneficiary = payable(makeAddr("beneficiary"));
         vm.deal(beneficiary, 1 wei);

test/modules/TokenReceiverModule.t.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.20;
 
-import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
-
+import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 
@@ -13,10 +12,11 @@ import {MockERC1155} from "../mocks/MockERC1155.sol";
 import {MockERC721} from "../mocks/MockERC721.sol";
 import {SingleSignerFactoryFixture} from "../mocks/SingleSignerFactoryFixture.sol";
 
+import {EntryPointUtils} from "../utils/EntryPointUtils.sol";
 import {OptimizedTest} from "../utils/OptimizedTest.sol";
 
-contract TokenReceiverModuleTest is OptimizedTest, IERC1155Receiver {
-    EntryPoint public entryPoint;
+contract TokenReceiverModuleTest is OptimizedTest, IERC1155Receiver, EntryPointUtils {
+    IEntryPoint public entryPoint;
     ReferenceModularAccount public acct;
     TokenReceiverModule public module;
 
@@ -34,7 +34,7 @@ contract TokenReceiverModuleTest is OptimizedTest, IERC1155Receiver {
     uint256 internal constant _BATCH_TOKEN_IDS = 5;
 
     function setUp() public {
-        entryPoint = new EntryPoint();
+        entryPoint = _deployEntryPoint();
         SingleSignerFactoryFixture factory =
             new SingleSignerFactoryFixture(entryPoint, _deploySingleSignerValidationModule());
 

test/script/Deploy.s.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 
-import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
+import {IEntryPoint} from "@eth-infinitism/account-abstraction/interfaces/IEntryPoint.sol";
 import {IStakeManager} from "@eth-infinitism/account-abstraction/interfaces/IStakeManager.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 
@@ -15,10 +15,12 @@ import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount
 import {SemiModularAccount} from "../../src/account/SemiModularAccount.sol";
 import {SingleSignerValidationModule} from "../../src/modules/validation/SingleSignerValidationModule.sol";
 
-contract DeployTest is Test {
+import {EntryPointUtils} from "../utils/EntryPointUtils.sol";
+
+contract DeployTest is Test, EntryPointUtils {
     DeployScript internal _deployScript;
 
-    EntryPoint internal _entryPoint;
+    IEntryPoint internal _entryPoint;
 
     address internal _owner;
 
@@ -28,7 +30,7 @@ contract DeployTest is Test {
     address internal _factory;
 
     function setUp() public {
-        _entryPoint = new EntryPoint();
+        _entryPoint = _deployEntryPoint();
 
         // Set the owner to the foundry default sender, as this is what will be used as the sender within the
         // `startBroadcast` segment of the script.