test: centralize erc20 mocks under test/mocks

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ae2079

test/DonationHandler.t.sol

@@ -3,30 +3,14 @@ pragma solidity ^0.8.0;
 
 import '../src/contracts/DonationHandler.sol';
 
-import './helpers/NoReturnMockERC20.sol';
+import './mocks/FailingMockERC20.sol';
+import './mocks/MockERC20.sol';
+import './mocks/NoReturnMockERC20.sol';
 
 import '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol';
-import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 import 'forge-std/Test.sol';
 
-// Mock ERC20 token for testing
-contract MockERC20 is ERC20 {
-  constructor() ERC20('MockToken', 'MTK') {
-    _mint(msg.sender, 1_000_000 * 10 ** 18);
-  }
-}
-
-contract FailingMockERC20 is ERC20 {
-  constructor() ERC20('FailingToken', 'FAIL') {
-    _mint(msg.sender, 1_000_000 * 10 ** 18);
-  }
-
-  function transferFrom(address, address, uint256) public pure override returns (bool) {
-    return false;
-  }
-}
-
 contract DonationHandlerTest is Test {
   DonationHandler public donationHandler;
   MockERC20 public mockToken;

test/DonationHandlerBugFix.t.sol

@@ -2,17 +2,12 @@
 pragma solidity ^0.8.0;
 
 import '../src/contracts/DonationHandler.sol';
+
+import './mocks/MockERC20.sol';
+
 import '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol';
-import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import 'forge-std/Test.sol';
 
-// Mock ERC20 token for testing
-contract MockERC20 is ERC20 {
-  constructor() ERC20('MockToken', 'MTK') {
-    _mint(msg.sender, 1_000_000 * 10 ** 18);
-  }
-}
-
 /// @title DonationHandlerBugFixTest
 /// @notice Tests for the bug fix that ensures amounts array sums to totalAmount
 /// @dev These tests verify the fix for the vulnerability where mismatched amounts could lock or steal ETH/tokens
@@ -45,7 +40,7 @@ contract DonationHandlerBugFixTest is Test {
     vm.deal(eve, 100 ether);
 
     // Give Alice some tokens
-    mockToken.transfer(alice, 10000e18);
+    mockToken.transfer(alice, 10_000e18);
   }
 
   /// @notice Test that donateManyETH reverts when amounts sum is less than totalAmount
@@ -203,14 +198,14 @@ contract DonationHandlerBugFixTest is Test {
     to[2] = alice;
     to[3] = makeAddr('charlie');
     to[4] = makeAddr('dave');
-    
+
     uint256[] memory amts = new uint256[](5);
     amts[0] = 1 ether;
     amts[1] = 2 ether;
     amts[2] = 3 ether;
     amts[3] = 2.5 ether;
     amts[4] = 1.5 ether; // Total = 10 ETH
-    
+
     bytes[] memory data = new bytes[](5);
 
     vm.prank(alice);

test/DonationHandlerMultisigCalls.t.sol

@@ -3,13 +3,13 @@ pragma solidity ^0.8.0;
 
 import '../src/contracts/DonationHandler.sol';
 
-import {DonationHandlerSetup, FailingMockERC20, MockERC20} from './DonationHandlerSetup.t.sol';
+import './DonationHandlerSetup.t.sol';
+import './mocks/FailingMockERC20.sol';
+import './mocks/MockERC20.sol';
+
 import '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol';
-import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import 'forge-std/Test.sol';
 
-// Mock ERC20 token for testing
-
 contract DummyMultisig {
   address public owner;
   bool public shouldRevert;
@@ -28,7 +28,11 @@ contract DummyMultisig {
   }
 
   // Execute a call to the donation handler
-  function executeTransaction(address target, uint256 value, bytes memory data) external payable returns (bool success) {
+  function executeTransaction(
+    address target,
+    uint256 value,
+    bytes memory data
+  ) external payable returns (bool success) {
     require(msg.sender == owner, 'Not authorized');
 
     if (shouldRevert) {

test/DonationHandlerSetup.t.sol

@@ -3,27 +3,12 @@ pragma solidity ^0.8.0;
 
 import '../src/contracts/DonationHandler.sol';
 
+import './mocks/FailingMockERC20.sol';
+import './mocks/MockERC20.sol';
+
 import '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol';
-import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import 'forge-std/Test.sol';
 
-// Mock ERC20 token for testing
-contract MockERC20 is ERC20 {
-  constructor() ERC20('MockToken', 'MTK') {
-    _mint(msg.sender, 1_000_000 * 10 ** 18);
-  }
-}
-
-contract FailingMockERC20 is ERC20 {
-  constructor() ERC20('FailingToken', 'FAIL') {
-    _mint(msg.sender, 1_000_000 * 10 ** 18);
-  }
-
-  function transferFrom(address, address, uint256) public pure override returns (bool) {
-    return false;
-  }
-}
-
 contract DonationHandlerSetup is Test {
   DonationHandler public donationHandler;
   MockERC20 public mockToken;

test/DonationHandlerStandardTests.t.sol

@@ -4,15 +4,11 @@ pragma solidity ^0.8.0;
 import '../src/contracts/DonationHandler.sol';
 
 import './DonationHandlerSetup.t.sol';
-import './helpers/NoReturnMockERC20.sol';
+import './mocks/NoReturnMockERC20.sol';
 
-import '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol';
-import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 import 'forge-std/Test.sol';
 
-// Mock ERC20 token for testing
-
 contract DonationHandlerStandardTests is DonationHandlerSetup {
   function setUp() public {
     // Deploy contracts

test/mocks/FailingMockERC20.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
+
+contract FailingMockERC20 is ERC20 {
+  constructor() ERC20('FailingToken', 'FAIL') {
+    _mint(msg.sender, 1_000_000 * 10 ** 18);
+  }
+
+  function transferFrom(address, address, uint256) public pure override returns (bool) {
+    return false;
+  }
+}

test/mocks/MockERC20.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
+
+contract MockERC20 is ERC20 {
+  constructor() ERC20('MockToken', 'MTK') {
+    _mint(msg.sender, 1_000_000 * 10 ** 18);
+  }
+}