Skip to content

Commit

Permalink
test: implement naming change suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
@pakim249CAL
pakim249CAL committed Aug 27, 2023
1 parent 764259c commit 9f3f850
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 34 deletions.
29 changes: 14 additions & 15 deletions test/forge/BaseTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,14 @@ contract BaseTest is Test {
address internal LIQUIDATOR = _addrFromHashedString("Morpho Liquidator");
address internal OWNER = _addrFromHashedString("Morpho Owner");

uint256 internal LLTV = 0.8 ether;

Morpho internal morpho;
ERC20 internal borrowableToken;
ERC20 internal collateralToken;
Oracle internal oracle;
Irm internal irm;
MarketParams internal marketParams;
Id internal id;
uint256 internal lltv;

function setUp() public virtual {
vm.label(OWNER, "Owner");
Expand Down Expand Up @@ -104,17 +103,17 @@ contract BaseTest is Test {
morpho.setAuthorization(BORROWER, true);
vm.stopPrank();

_setLltv(LLTV);
_setLltv(0.8 ether);
}

function _setLltv(uint256 lltv) internal {
LLTV = lltv;
function _setLltv(uint256 _lltv) internal {
lltv = _lltv;
marketParams =
MarketParams(address(borrowableToken), address(collateralToken), address(oracle), address(irm), lltv);
MarketParams(address(borrowableToken), address(collateralToken), address(oracle), address(irm), _lltv);
id = marketParams.id();

vm.startPrank(OWNER);
if (!morpho.isLltvEnabled(lltv)) morpho.enableLltv(lltv);
if (!morpho.isLltvEnabled(_lltv)) morpho.enableLltv(_lltv);
if (morpho.lastUpdate(marketParams.id()) == 0) morpho.createMarket(marketParams);
vm.stopPrank();

Expand Down Expand Up @@ -180,21 +179,21 @@ contract BaseTest is Test {
return (amountCollateral, amountBorrowed, priceCollateral);
}

function _boundTestLltv(uint256 lltv) internal view returns (uint256) {
return bound(lltv, MIN_TEST_LLTV, MAX_TEST_LLTV);
function _boundTestLltv(uint256 _lltv) internal view returns (uint256) {
return bound(_lltv, MIN_TEST_LLTV, MAX_TEST_LLTV);
}

function _boundValidLltv(uint256 lltv) internal view returns (uint256) {
return bound(lltv, 0, WAD - 1);
function _boundValidLltv(uint256 _lltv) internal view returns (uint256) {
return bound(_lltv, 0, WAD - 1);
}

function _boundInvalidLltv(uint256 lltv) internal view returns (uint256) {
return bound(lltv, WAD, type(uint256).max);
function _boundInvalidLltv(uint256 _lltv) internal view returns (uint256) {
return bound(_lltv, WAD, type(uint256).max);
}

function _liquidationIncentive(uint256 lltv) internal pure returns (uint256) {
function _liquidationIncentive(uint256 _lltv) internal pure returns (uint256) {
return
UtilsLib.min(MAX_LIQUIDATION_INCENTIVE_FACTOR, WAD.wDivDown(WAD - LIQUIDATION_CURSOR.wMulDown(WAD - lltv)));
UtilsLib.min(MAX_LIQUIDATION_INCENTIVE_FACTOR, WAD.wDivDown(WAD - LIQUIDATION_CURSOR.wMulDown(WAD - _lltv)));
}

function _accrueInterest(MarketParams memory market) internal {
Expand Down
12 changes: 6 additions & 6 deletions test/forge/integration/CreateMarketIntegrationTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ contract CreateMarketIntegrationTest is BaseTest {
using MarketParamsLib for MarketParams;

function testCreateMarketWithNotEnabledIrmAndNotEnabledLltv(MarketParams memory marketParamsFuzz) public {
vm.assume(marketParamsFuzz.irm != address(irm) && marketParamsFuzz.lltv != LLTV);
vm.assume(marketParamsFuzz.irm != address(irm) && marketParamsFuzz.lltv != lltv);

vm.prank(OWNER);
vm.expectRevert(bytes(ErrorsLib.IRM_NOT_ENABLED));
Expand All @@ -21,15 +21,15 @@ contract CreateMarketIntegrationTest is BaseTest {
marketParamsFuzz.lltv = _boundValidLltv(marketParamsFuzz.lltv);

vm.startPrank(OWNER);
if (marketParamsFuzz.lltv != LLTV) morpho.enableLltv(marketParamsFuzz.lltv);
if (marketParamsFuzz.lltv != lltv) morpho.enableLltv(marketParamsFuzz.lltv);

vm.expectRevert(bytes(ErrorsLib.IRM_NOT_ENABLED));
morpho.createMarket(marketParamsFuzz);
vm.stopPrank();
}

function testCreateMarketWithEnabledIrmAndNotEnabledLltv(MarketParams memory marketParamsFuzz) public {
vm.assume(marketParamsFuzz.lltv != LLTV);
vm.assume(marketParamsFuzz.lltv != lltv);

vm.startPrank(OWNER);
if (marketParamsFuzz.irm != marketParams.irm) morpho.enableIrm(marketParamsFuzz.irm);
Expand All @@ -45,7 +45,7 @@ contract CreateMarketIntegrationTest is BaseTest {

vm.startPrank(OWNER);
if (marketParamsFuzz.irm != marketParams.irm) morpho.enableIrm(marketParamsFuzz.irm);
if (marketParamsFuzz.lltv != LLTV) morpho.enableLltv(marketParamsFuzz.lltv);
if (marketParamsFuzz.lltv != lltv) morpho.enableLltv(marketParamsFuzz.lltv);

vm.expectEmit(true, true, true, true, address(morpho));
emit EventsLib.CreateMarket(marketParamsFuzz.id(), marketParamsFuzz);
Expand All @@ -65,7 +65,7 @@ contract CreateMarketIntegrationTest is BaseTest {

vm.startPrank(OWNER);
if (marketParamsFuzz.irm != marketParams.irm) morpho.enableIrm(marketParamsFuzz.irm);
if (marketParamsFuzz.lltv != LLTV) morpho.enableLltv(marketParamsFuzz.lltv);
if (marketParamsFuzz.lltv != lltv) morpho.enableLltv(marketParamsFuzz.lltv);
morpho.createMarket(marketParamsFuzz);

vm.expectRevert(bytes(ErrorsLib.MARKET_ALREADY_CREATED));
Expand All @@ -79,7 +79,7 @@ contract CreateMarketIntegrationTest is BaseTest {

vm.startPrank(OWNER);
if (marketParamsFuzz.irm != marketParams.irm) morpho.enableIrm(marketParamsFuzz.irm);
if (marketParamsFuzz.lltv != LLTV) morpho.enableLltv(marketParamsFuzz.lltv);
if (marketParamsFuzz.lltv != lltv) morpho.enableLltv(marketParamsFuzz.lltv);

morpho.createMarket(marketParamsFuzz);
vm.stopPrank();
Expand Down
6 changes: 3 additions & 3 deletions test/forge/integration/OnlyOwnerIntegrationTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ contract OnlyOwnerIntegrationTest is BaseTest {

function testEnableLltvWhenNotOwner(address addressFuzz, uint256 lltvFuzz) public {
vm.assume(addressFuzz != OWNER);
vm.assume(lltvFuzz != LLTV);
vm.assume(lltvFuzz != lltv);

vm.prank(addressFuzz);
vm.expectRevert(bytes(ErrorsLib.NOT_OWNER));
Expand All @@ -75,7 +75,7 @@ contract OnlyOwnerIntegrationTest is BaseTest {
function testEnableLltvAlreadySet() public {
vm.prank(OWNER);
vm.expectRevert(bytes(ErrorsLib.ALREADY_SET));
morpho.enableLltv(LLTV);
morpho.enableLltv(lltv);
}

function testEnableTooHighLltv(uint256 lltvFuzz) public {
Expand All @@ -88,7 +88,7 @@ contract OnlyOwnerIntegrationTest is BaseTest {

function testEnableLltv(uint256 lltvFuzz) public {
lltvFuzz = _boundValidLltv(lltvFuzz);
vm.assume(lltvFuzz != LLTV);
vm.assume(lltvFuzz != lltv);

vm.prank(OWNER);
vm.expectEmit(true, true, true, true, address(morpho));
Expand Down
4 changes: 2 additions & 2 deletions test/forge/invariant/TwoMarketsInvariantTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ contract TwoMarketsInvariantTest is InvariantTest {
vm.label(address(irm2), "IRM2");

marketParams2 =
MarketParams(address(borrowableToken), address(collateralToken), address(oracle), address(irm2), LLTV + 1);
MarketParams(address(borrowableToken), address(collateralToken), address(oracle), address(irm2), lltv + 1);
id2 = marketParams2.id();

vm.startPrank(OWNER);
morpho.enableIrm(address(irm2));
morpho.enableLltv(LLTV + 1);
morpho.enableLltv(lltv + 1);
morpho.createMarket(marketParams2);
vm.stopPrank();

Expand Down
4 changes: 2 additions & 2 deletions test/forge/libraries/periphery/MorphoBalancesLibTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ contract MorphoBalancesLibTest is BaseTest {
if (amountBorrowed > 0) {
uint256 collateralPrice = IOracle(marketParams.oracle).price();
collateralToken.setBalance(
BORROWER, amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice)
BORROWER, amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice)
);

vm.startPrank(BORROWER);
morpho.supplyCollateral(
marketParams,
amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice),
amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice),
BORROWER,
hex""
);
Expand Down
4 changes: 2 additions & 2 deletions test/forge/libraries/periphery/MorphoLibTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ contract MorphoLibTest is BaseTest {
morpho.supply(marketParams, amountSupplied, 0, address(this), hex"");

uint256 collateralPrice = IOracle(marketParams.oracle).price();
collateralToken.setBalance(BORROWER, amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice));
collateralToken.setBalance(BORROWER, amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice));

vm.startPrank(BORROWER);
morpho.supplyCollateral(
marketParams, amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice), BORROWER, hex""
marketParams, amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice), BORROWER, hex""
);
morpho.borrow(marketParams, amountBorrowed, 0, BORROWER, BORROWER);
vm.stopPrank();
Expand Down
8 changes: 4 additions & 4 deletions test/forge/libraries/periphery/MorphoStorageLibTest.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ contract MorphoStorageLibTest is BaseTest {
morpho.supply(marketParams, amountSupplied, 0, address(this), hex"");

uint256 collateralPrice = IOracle(marketParams.oracle).price();
collateralToken.setBalance(BORROWER, amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice));
collateralToken.setBalance(BORROWER, amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice));

vm.startPrank(BORROWER);
morpho.supplyCollateral(
marketParams, amountBorrowed.wDivUp(LLTV).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice), BORROWER, hex""
marketParams, amountBorrowed.wDivUp(lltv).mulDivUp(ORACLE_PRICE_SCALE, collateralPrice), BORROWER, hex""
);
morpho.borrow(marketParams, amountBorrowed, 0, BORROWER, BORROWER);
vm.stopPrank();
Expand Down Expand Up @@ -63,7 +63,7 @@ contract MorphoStorageLibTest is BaseTest {
slots[5] = MorphoStorageLib.marketTotalBorrowAssetsAndSharesSlot(id);
slots[6] = MorphoStorageLib.marketLastUpdateAndFeeSlot(id);
slots[7] = MorphoStorageLib.isIrmEnabledSlot(address(irm));
slots[8] = MorphoStorageLib.isLltvEnabledSlot(LLTV);
slots[8] = MorphoStorageLib.isLltvEnabledSlot(lltv);
slots[9] = MorphoStorageLib.isAuthorizedSlot(authorizer, BORROWER);
slots[10] = MorphoStorageLib.nonceSlot(authorizer);
slots[11] = MorphoStorageLib.idToBorrowableTokenSlot(id);
Expand All @@ -86,7 +86,7 @@ contract MorphoStorageLibTest is BaseTest {
assertEq(uint128(uint256(values[6])), morpho.lastUpdate(id));
assertEq(uint256(values[6] >> 128), morpho.fee(id));
assertEq(abi.decode(abi.encode(values[7]), (bool)), morpho.isIrmEnabled(address(irm)));
assertEq(abi.decode(abi.encode(values[8]), (bool)), morpho.isLltvEnabled(LLTV));
assertEq(abi.decode(abi.encode(values[8]), (bool)), morpho.isLltvEnabled(lltv));
assertEq(abi.decode(abi.encode(values[9]), (bool)), morpho.isAuthorized(authorizer, BORROWER));
assertEq(uint256(values[10]), morpho.nonce(authorizer));

Expand Down

0 comments on commit 9f3f850

Please sign in to comment.