test: changePrank

morpho-org · Oct 10, 2023 · 59a425d · 59a425d
1 parent 7e03955
commit 59a425d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/test/forge/BaseTest.sol b/test/forge/BaseTest.sol
@@ -87,23 +87,24 @@ contract BaseTest is Test {
 
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
+
         vm.startPrank(SUPPLIER);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
-        vm.stopPrank();
-        vm.startPrank(BORROWER);
+
+        changePrank(BORROWER);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
-        vm.stopPrank();
-        vm.startPrank(REPAYER);
+
+        changePrank(REPAYER);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
-        vm.stopPrank();
-        vm.startPrank(LIQUIDATOR);
+
+        changePrank(LIQUIDATOR);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
-        vm.stopPrank();
-        vm.startPrank(ONBEHALF);
+
+        changePrank(ONBEHALF);
         loanToken.approve(address(morpho), type(uint256).max);
         collateralToken.approve(address(morpho), type(uint256).max);
         morpho.setAuthorization(BORROWER, true);

diff --git a/test/forge/integration/BorrowIntegrationTest.sol b/test/forge/integration/BorrowIntegrationTest.sol
@@ -54,9 +54,8 @@ contract BorrowIntegrationTest is BaseTest {
         vm.startPrank(supplier);
         collateralToken.approve(address(morpho), amountCollateral);
         morpho.supplyCollateral(marketParams, amountCollateral, supplier, hex"");
-        vm.stopPrank();
 
-        vm.prank(attacker);
+        changePrank(attacker);
         vm.expectRevert(bytes(ErrorsLib.UNAUTHORIZED));
         morpho.borrow(marketParams, amountBorrowed, 0, supplier, RECEIVER);
     }

diff --git a/test/forge/integration/RepayIntegrationTest.sol b/test/forge/integration/RepayIntegrationTest.sol
@@ -62,7 +62,6 @@ contract RepayIntegrationTest is BaseTest {
         vm.stopPrank();
 
         vm.prank(REPAYER);
-
         vm.expectEmit(true, true, true, true, address(morpho));
         emit EventsLib.Repay(id, REPAYER, ONBEHALF, amountRepaid, expectedRepaidShares);
         (uint256 returnAssets, uint256 returnShares) = morpho.repay(marketParams, amountRepaid, 0, ONBEHALF, hex"");

diff --git a/test/forge/libraries/periphery/MorphoStorageLibTest.sol b/test/forge/libraries/periphery/MorphoStorageLibTest.sol
@@ -20,9 +20,8 @@ contract MorphoStorageLibTest is BaseTest {
         fee = bound(fee, 1, MAX_FEE);
 
         // Set fee parameters.
-        vm.startPrank(OWNER);
+        vm.prank(OWNER);
         morpho.setFee(marketParams, fee);
-        vm.stopPrank();
 
         loanToken.setBalance(address(this), amountSupplied);
         morpho.supply(marketParams, amountSupplied, 0, address(this), hex"");