Simplify CallReceiverMock

contracts/mocks/CallReceiverMock.sol

@@ -2,77 +2,12 @@
 
 pragma solidity ^0.8.20;
 
-contract CallReceiverMock {
-    event MockFunctionCalled();
-    event MockFunctionCalledWithArgs(uint256 a, uint256 b);
-    event MockFunctionCalledExtra(address caller, uint256 value);
-
-    uint256[] private _array;
+import {CallReceiverMock} from "@openzeppelin/contracts/mocks/CallReceiverMock.sol";
 
-    function mockFunction() public payable returns (string memory) {
-        emit MockFunctionCalled();
-
-        return "0x1234";
-    }
+contract CallReceiverMockExtended is CallReceiverMock {
+    event MockFunctionCalledExtra(address caller, uint256 value);
 
     function mockFunctionExtra() public payable {
         emit MockFunctionCalledExtra(msg.sender, msg.value);
     }
-
-    function mockFunctionEmptyReturn() public payable {
-        emit MockFunctionCalled();
-    }
-
-    function mockFunctionWithArgs(uint256 a, uint256 b) public payable returns (string memory) {
-        emit MockFunctionCalledWithArgs(a, b);
-
-        return "0x1234";
-    }
-
-    function mockFunctionNonPayable() public returns (string memory) {
-        emit MockFunctionCalled();
-
-        return "0x1234";
-    }
-
-    function mockStaticFunction() public pure returns (string memory) {
-        return "0x1234";
-    }
-
-    function mockFunctionRevertsNoReason() public payable {
-        revert();
-    }
-
-    function mockFunctionRevertsReason() public payable {
-        revert("CallReceiverMock: reverting");
-    }
-
-    function mockFunctionThrows() public payable {
-        assert(false);
-    }
-
-    function mockFunctionOutOfGas() public payable {
-        for (uint256 i = 0; ; ++i) {
-            _array.push(i);
-        }
-    }
-
-    function mockFunctionWritesStorage(bytes32 slot, bytes32 value) public returns (string memory) {
-        assembly {
-            sstore(slot, value)
-        }
-        return "0x1234";
-    }
-}
-
-contract CallReceiverMockTrustingForwarder is CallReceiverMock {
-    address private _trustedForwarder;
-
-    constructor(address trustedForwarder_) {
-        _trustedForwarder = trustedForwarder_;
-    }
-
-    function isTrustedForwarder(address forwarder) public view virtual returns (bool) {
-        return forwarder == _trustedForwarder;
-    }
 }

test/account/draft-AccountBase.test.js

@@ -6,7 +6,7 @@ const { BooleanSigner } = require('../helpers/signers');
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
-  const target = await ethers.deployContract('CallReceiverMock');
+  const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new BooleanSigner();
   const helper = new ERC4337Helper('$AccountBaseMock');
   const smartAccount = await helper.newAccount();

test/account/draft-AccountECDSA.test.js

@@ -11,7 +11,7 @@ const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
-  const target = await ethers.deployContract('CallReceiverMock');
+  const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new ECDSASigner();
   const helper = new ERC4337Helper('$AccountECDSA');
   const smartAccount = await helper.newAccount(['AccountECDSA', '1', signer.EOA.address]);

test/account/draft-AccountP256.test.js

@@ -11,7 +11,7 @@ const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
-  const target = await ethers.deployContract('CallReceiverMock');
+  const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new P256Signer();
   const helper = new ERC4337Helper('$AccountP256');
   const smartAccount = await helper.newAccount(['AccountP256', '1', signer.publicKey.qx, signer.publicKey.qy]);

test/account/draft-AccountRSA.test.js

@@ -11,7 +11,7 @@ const { shouldBehaveLikeERC7739Signer } = require('../utils/cryptography/ERC7739
 
 async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
-  const target = await ethers.deployContract('CallReceiverMock');
+  const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new RSASigner();
   const helper = new ERC4337Helper('$AccountRSA');
   const smartAccount = await helper.newAccount(['AccountRSA', '1', signer.publicKey.e, signer.publicKey.n]);