test: fix wrong changes in refactor

morpho-org · May 13, 2024 · 13c711f · 13c711f
1 parent ccac0bf
commit 13c711f
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 0 deletions.
diff --git a/test/forge/BaseBundlerLocalTest.sol b/test/forge/BaseBundlerLocalTest.sol
@@ -5,7 +5,15 @@ import {ErrorsLib} from "src/libraries/ErrorsLib.sol";
 
 import "./helpers/LocalTest.sol";
 
+contract BaseBundlerMock is BaseBundler {}
+
 contract BaseBundlerLocalTest is LocalTest {
+    function setUp() public override {
+        super.setUp();
+
+        bundler = new BaseBundlerMock();
+    }
+
     function testMulticallEmpty() public {
         bundler.multicall(bundle);
     }

diff --git a/test/forge/ERC20WrapperBundlerLocalTest.sol b/test/forge/ERC20WrapperBundlerLocalTest.sol
@@ -7,12 +7,16 @@ import {ERC20WrapperMock, ERC20Wrapper} from "../../src/mocks/ERC20WrapperMock.s
 
 import "./helpers/LocalTest.sol";
 
+contract ERC20WrapperBundlerMock is ERC20WrapperBundler, TransferBundler {}
+
 contract ERC20WrapperBundlerBundlerLocalTest is LocalTest {
     ERC20WrapperMock internal loanWrapper;
 
     function setUp() public override {
         super.setUp();
 
+        bundler = new ERC20WrapperBundlerMock();
+
         loanWrapper = new ERC20WrapperMock(loanToken, "Wrapped Loan Token", "WLT");
     }
 

diff --git a/test/forge/ERC4626BundlerLocalTest.sol b/test/forge/ERC4626BundlerLocalTest.sol
@@ -7,12 +7,16 @@ import {ERC4626Mock} from "../../src/mocks/ERC4626Mock.sol";
 
 import "./helpers/LocalTest.sol";
 
+contract ERC4626BundlerMock is ERC4626Bundler, TransferBundler {}
+
 contract ERC4626BundlerLocalTest is LocalTest {
     ERC4626Mock internal vault;
 
     function setUp() public override {
         super.setUp();
 
+        bundler = new ERC4626BundlerMock();
+
         vault = new ERC4626Mock(address(loanToken), "LoanToken Vault", "BV");
 
         vm.startPrank(USER);

diff --git a/test/forge/MorphoBundlerLocalTest.sol b/test/forge/MorphoBundlerLocalTest.sol
@@ -15,6 +15,14 @@ import {MarketParamsLib} from "../../lib/morpho-blue/src/libraries/MarketParamsL
 
 import "./helpers/MetaMorphoLocalTest.sol";
 
+contract MorphoBundlerMock is MorphoBundler, TransferBundler {
+    constructor(address morpho) MorphoBundler(morpho) {}
+
+    function _isSenderAuthorized() internal view override(BaseBundler, MorphoBundler) returns (bool) {
+        return MorphoBundler._isSenderAuthorized();
+    }
+}
+
 contract MorphoBundlerLocalTest is MetaMorphoLocalTest {
     using MathLib for uint256;
     using MorphoLib for IMorpho;
@@ -25,6 +33,8 @@ contract MorphoBundlerLocalTest is MetaMorphoLocalTest {
     function setUp() public override {
         super.setUp();
 
+        bundler = new MorphoBundlerMock(address(morpho));
+
         vm.startPrank(USER);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);

diff --git a/test/forge/PermitBundlerLocalTest.sol b/test/forge/PermitBundlerLocalTest.sol
@@ -9,12 +9,16 @@ import {ERC20PermitMock} from "../../src/mocks/ERC20PermitMock.sol";
 
 import "./helpers/LocalTest.sol";
 
+contract PermitBundlerMock is TransferBundler, PermitBundler {}
+
 contract PermitBundlerLocalTest is LocalTest {
     ERC20PermitMock internal permitToken;
 
     function setUp() public override {
         super.setUp();
 
+        bundler = new PermitBundlerMock();
+
         permitToken = new ERC20PermitMock("Permit Token", "PT");
     }
 

diff --git a/test/forge/TransferBundlerLocalTest.sol b/test/forge/TransferBundlerLocalTest.sol
@@ -5,7 +5,15 @@ import {ErrorsLib} from "../../src/libraries/ErrorsLib.sol";
 
 import "./helpers/LocalTest.sol";
 
+contract TransferBundlerMock is TransferBundler {}
+
 contract TransferBundlerLocalTest is LocalTest {
+    function setUp() public override {
+        super.setUp();
+
+        bundler = new TransferBundlerMock();
+    }
+
     function testTransfer(uint256 amount) public {
         amount = bound(amount, 0, MAX_AMOUNT);
 

diff --git a/test/forge/UrdBundlerLocalTest.sol b/test/forge/UrdBundlerLocalTest.sol
@@ -15,6 +15,8 @@ interface IUrdFactory {
     function createUrd(address, uint256, bytes32, bytes32, bytes32) external returns (address);
 }
 
+contract UrdBundlerMock is UrdBundler {}
+
 contract UrdBundlerLocalTest is LocalTest {
     IUrdFactory internal urdFactory;
     Merkle internal merkle;
@@ -24,6 +26,8 @@ contract UrdBundlerLocalTest is LocalTest {
     function setUp() public override {
         super.setUp();
 
+        bundler = new UrdBundlerMock();
+
         urdFactory = IUrdFactory(deployCode("UrdFactory.sol", ""));
         vm.label(address(urdFactory), "UrdFactory");
         merkle = new Merkle();

diff --git a/test/forge/fork/StEthBundlerForkTest.sol b/test/forge/fork/StEthBundlerForkTest.sol
@@ -5,13 +5,25 @@ import {IAllowanceTransfer} from "../../../lib/permit2/src/interfaces/IAllowance
 
 import {ErrorsLib} from "../../../src/libraries/ErrorsLib.sol";
 
+import "../../../src/ethereum/EthereumStEthBundler.sol";
+
 import "./helpers/ForkTest.sol";
 
 bytes32 constant BEACON_BALANCE_POSITION = 0xa66d35f054e68143c18f32c990ed5cb972bb68a68f500cd2dd3a16bbf3686483; // keccak256("lido.Lido.beaconBalance");
 
+contract EthereumStEthBundlerMock is TransferBundler, Permit2Bundler, EthereumStEthBundler {}
+
 contract EthereumStEthBundlerForkTest is ForkTest {
     using SafeTransferLib for ERC20;
 
+    function setUp() public override {
+        if (block.chainid != 1) return;
+
+        super.setUp();
+
+        bundler = new EthereumStEthBundlerMock();
+    }
+
     function testStakeEthZeroAmount() public onlyEthereum {
         bundle.push(abi.encodeCall(StEthBundler.stakeEth, (0, 0, address(0))));