Skip to content

Commit

Permalink
fix: more consistent naming + removing Slot1
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xmikko
0xmikko committed Apr 28, 2023
1 parent 3043320 commit ff2af5c
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 123 deletions.
12 changes: 6 additions & 6 deletions contracts/credit/CreditConfigurator.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ contract CreditConfigurator is ICreditConfigurator, ACLNonReentrantTrait {
}

// Connects creditFacade and priceOracle
creditManager.upgradeCreditFacade(address(_creditFacade)); // F:[CC-1]
creditManager.setCreditFacade(address(_creditFacade)); // F:[CC-1]

emit SetCreditFacade(address(_creditFacade)); // F: [CC-1A]
emit SetPriceOracle(address(creditManager.priceOracle())); // F: [CC-1A]
Expand Down Expand Up @@ -566,7 +566,7 @@ contract CreditConfigurator is ICreditConfigurator, ACLNonReentrantTrait {

/// @dev Upgrades the price oracle in the Credit Manager, taking the address
/// from the address provider
function upgradePriceOracle()
function setPriceOracle()
external
configuratorOnly // F:[CC-2]
{
Expand All @@ -575,15 +575,15 @@ contract CreditConfigurator is ICreditConfigurator, ACLNonReentrantTrait {

// Checks that the price oracle is actually new to avoid emitting redundant events
if (priceOracle != currentPriceOracle) {
creditManager.upgradePriceOracle(priceOracle); // F: [CC-28]
creditManager.setPriceOracle(priceOracle); // F: [CC-28]
emit SetPriceOracle(priceOracle); // F:[CC-28]
}
}

/// @dev Upgrades the Credit Facade corresponding to the Credit Manager
/// @param _creditFacade address of the new CreditFacadeV3
/// @param migrateParams Whether the previous CreditFacadeV3's parameter need to be copied
function upgradeCreditFacade(address _creditFacade, bool migrateParams)
function setCreditFacade(address _creditFacade, bool migrateParams)
external
configuratorOnly // F:[CC-2]
{
Expand All @@ -607,7 +607,7 @@ contract CreditConfigurator is ICreditConfigurator, ACLNonReentrantTrait {
address botList = creditFacade().botList();

// Sets Credit Facade to the new address
creditManager.upgradeCreditFacade(_creditFacade); // F:[CC-30]
creditManager.setCreditFacade(_creditFacade); // F:[CC-30]

if (migrateParams) {
// Copies all limits and restrictions on borrowing
Expand Down Expand Up @@ -638,7 +638,7 @@ contract CreditConfigurator is ICreditConfigurator, ACLNonReentrantTrait {

_revertIfContractIncompatible(_creditConfigurator); // F:[CC-29]

creditManager.setConfigurator(_creditConfigurator); // F:[CC-31]
creditManager.setCreditConfigurator(_creditConfigurator); // F:[CC-31]
emit CreditConfiguratorUpgraded(_creditConfigurator); // F:[CC-31]
}

Expand Down
136 changes: 64 additions & 72 deletions contracts/credit/CreditManagerV3.sol
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/factories/CreditManagerFactory.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract CreditManagerFactory {

creditConfigurator = CreditConfigurator(Create2.computeAddress(salt, keccak256(configuratorByteCode)));

creditManager.setConfigurator(address(creditConfigurator));
creditManager.setCreditConfigurator(address(creditConfigurator));

Create2.deploy(0, salt, configuratorByteCode);

Expand Down
4 changes: 2 additions & 2 deletions contracts/interfaces/ICreditConfigurator.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,12 @@ interface ICreditConfigurator is ICreditConfiguratorEvents, IVersion {

/// @dev Upgrades the price oracle in the Credit Manager, taking the address
/// from the address provider
function upgradePriceOracle() external;
function setPriceOracle() external;

/// @dev Upgrades the Credit Facade corresponding to the Credit Manager
/// @param _creditFacade address of the new CreditFacadeV3
/// @param migrateParams Whether the previous CreditFacadeV3's parameter need to be copied
function upgradeCreditFacade(address _creditFacade, bool migrateParams) external;
function setCreditFacade(address _creditFacade, bool migrateParams) external;

/// @dev Upgrades the Credit Configurator for a connected Credit Manager
/// @param _creditConfigurator New Credit Configurator's address
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/ICreditManagerV3.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ interface ICreditManagerV3Events {
event ExecuteOrder(address indexed targetContract);

/// @dev Emits when a configurator is upgraded
event SetConfigurator(address indexed newConfigurator);
event SetCreditConfigurator(address indexed newConfigurator);
}

/// @notice All Credit Manager functions are access-restricted and can only be called
Expand Down
6 changes: 3 additions & 3 deletions contracts/test/suites/CreditFacadeTestSuite.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ contract CreditFacadeTestSuite is PoolDeployer {
false
);

creditConfigurator.upgradeCreditFacade(address(creditFacade), true);
creditConfigurator.setCreditFacade(address(creditFacade), true);

degenNFT.addCreditFacade(address(creditFacade));

Expand All @@ -130,7 +130,7 @@ contract CreditFacadeTestSuite is PoolDeployer {
true
);

creditConfigurator.upgradeCreditFacade(address(creditFacade), true);
creditConfigurator.setCreditFacade(address(creditFacade), true);
creditConfigurator.setExpirationDate(uint40(block.timestamp + 1));

evm.stopPrank();
Expand All @@ -146,7 +146,7 @@ contract CreditFacadeTestSuite is PoolDeployer {
false
);

creditConfigurator.upgradeCreditFacade(address(creditFacade), true);
creditConfigurator.setCreditFacade(address(creditFacade), true);

// blacklistHelper.addCreditFacade(address(creditFacade));

Expand Down
4 changes: 2 additions & 2 deletions contracts/test/suites/CreditManagerTestSuite.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ contract CreditManagerTestSuite is PoolDeployer {

creditFacade = msg.sender;

creditManager.setConfigurator(CONFIGURATOR);
creditManager.setCreditConfigurator(CONFIGURATOR);

evm.startPrank(CONFIGURATOR);

creditManager.upgradeCreditFacade(creditFacade);
creditManager.setCreditFacade(creditFacade);

creditManager.setParams(
DEFAULT_FEE_INTEREST,
Expand Down
36 changes: 18 additions & 18 deletions contracts/test/unit/credit/CreditConfigurator.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig

address creditConfiguratorAddr = _getAddress(configuratorByteCode, 0);

creditManager.setConfigurator(creditConfiguratorAddr);
creditManager.setCreditConfigurator(creditConfiguratorAddr);

evm.expectEmit(true, false, false, true);
emit SetTokenLiquidationThreshold(underlying, DEFAULT_UNDERLYING_LT);
Expand Down Expand Up @@ -330,10 +330,10 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig

// Upgrades
evm.expectRevert(CallerNotConfiguratorException.selector);
creditConfigurator.upgradePriceOracle();
creditConfigurator.setPriceOracle();

evm.expectRevert(CallerNotConfiguratorException.selector);
creditConfigurator.upgradeCreditFacade(DUMB_ADDRESS, false);
creditConfigurator.setCreditFacade(DUMB_ADDRESS, false);

evm.expectRevert(CallerNotConfiguratorException.selector);
creditConfigurator.upgradeCreditConfigurator(DUMB_ADDRESS);
Expand Down Expand Up @@ -871,51 +871,51 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig
// CONTRACT UPGRADES
//

/// @dev [CC-28]: upgradePriceOracle upgrades priceOracleCorrectly and doesnt change facade
function test_CC_28_upgradePriceOracle_upgrades_priceOracleCorrectly_and_doesnt_change_facade() public {
/// @dev [CC-28]: setPriceOracle upgrades priceOracleCorrectly and doesnt change facade
function test_CC_28_setPriceOracle_upgrades_priceOracleCorrectly_and_doesnt_change_facade() public {
evm.startPrank(CONFIGURATOR);
cct.addressProvider().setPriceOracle(DUMB_ADDRESS);

evm.expectEmit(true, false, false, false);
emit SetPriceOracle(DUMB_ADDRESS);

creditConfigurator.upgradePriceOracle();
creditConfigurator.setPriceOracle();

assertEq(address(creditManager.priceOracle()), DUMB_ADDRESS);
evm.stopPrank();
}

/// @dev [CC-29]: upgradePriceOracle upgrades priceOracleCorrectly and doesnt change facade
function test_CC_29_upgradeCreditFacade_upgradeCreditConfigurator_reverts_for_incompatible_contracts() public {
/// @dev [CC-29]: setPriceOracle upgrades priceOracleCorrectly and doesnt change facade
function test_CC_29_setCreditFacade_upgradeCreditConfigurator_reverts_for_incompatible_contracts() public {
evm.startPrank(CONFIGURATOR);

evm.expectRevert(ZeroAddressException.selector);
creditConfigurator.upgradeCreditFacade(address(0), false);
creditConfigurator.setCreditFacade(address(0), false);

evm.expectRevert(ZeroAddressException.selector);
creditConfigurator.upgradeCreditConfigurator(address(0));

evm.expectRevert(abi.encodeWithSelector(AddressIsNotContractException.selector, DUMB_ADDRESS));
creditConfigurator.upgradeCreditFacade(DUMB_ADDRESS, false);
creditConfigurator.setCreditFacade(DUMB_ADDRESS, false);

evm.expectRevert(abi.encodeWithSelector(AddressIsNotContractException.selector, DUMB_ADDRESS));
creditConfigurator.upgradeCreditConfigurator(DUMB_ADDRESS);

evm.expectRevert(IncompatibleContractException.selector);
creditConfigurator.upgradeCreditFacade(underlying, false);
creditConfigurator.setCreditFacade(underlying, false);

evm.expectRevert(IncompatibleContractException.selector);
creditConfigurator.upgradeCreditConfigurator(underlying);

evm.expectRevert(IncompatibleContractException.selector);
creditConfigurator.upgradeCreditFacade(address(adapterDifferentCM), false);
creditConfigurator.setCreditFacade(address(adapterDifferentCM), false);

evm.expectRevert(IncompatibleContractException.selector);
creditConfigurator.upgradeCreditConfigurator(address(adapterDifferentCM));
}

/// @dev [CC-30]: upgradeCreditFacade upgrades creditFacade and doesnt change priceOracle
function test_CC_30_upgradeCreditFacade_upgrades_creditFacade_and_doesnt_change_priceOracle() public {
/// @dev [CC-30]: setCreditFacade upgrades creditFacade and doesnt change priceOracle
function test_CC_30_setCreditFacade_upgrades_creditFacade_and_doesnt_change_priceOracle() public {
for (uint256 id = 0; id < 2; id++) {
bool isIDF = id != 0;
for (uint256 ex = 0; ex < 2; ex++) {
Expand All @@ -934,7 +934,7 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig
);

evm.prank(CONFIGURATOR);
creditConfigurator.upgradeCreditFacade(address(initialCf), migrateSettings);
creditConfigurator.setCreditFacade(address(initialCf), migrateSettings);

evm.prank(CONFIGURATOR);
creditConfigurator.setExpirationDate(uint40(block.timestamp + 1));
Expand All @@ -958,7 +958,7 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig
emit SetCreditFacade(address(cf));

evm.prank(CONFIGURATOR);
creditConfigurator.upgradeCreditFacade(address(cf), migrateSettings);
creditConfigurator.setCreditFacade(address(cf), migrateSettings);

assertEq(address(creditManager.priceOracle()), cct.addressProvider().getPriceOracle());

Expand Down Expand Up @@ -987,7 +987,7 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig
}
}

/// @dev [CC-30A]: uupgradeCreditFacade transfers bot list
/// @dev [CC-30A]: usetCreditFacade transfers bot list
function test_CC_30A_botList_is_transferred_on_CreditFacade_upgrade() public {
for (uint256 ms = 0; ms < 2; ms++) {
bool migrateSettings = ms != 0;
Expand All @@ -1006,7 +1006,7 @@ contract CreditConfiguratorTest is DSTest, ICreditManagerV3Events, ICreditConfig
);

evm.prank(CONFIGURATOR);
creditConfigurator.upgradeCreditFacade(address(cf), migrateSettings);
creditConfigurator.setCreditFacade(address(cf), migrateSettings);

address botList2 = cf.botList();

Expand Down
36 changes: 18 additions & 18 deletions contracts/test/unit/credit/CreditManager.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
/// - setForbidMask
/// - changeContractAllowance
/// - upgradeContracts
/// - setConfigurator
/// - setCreditConfigurator
/// - addEmergencyLiquidator
/// - removeEmergenceLiquidator
function test_CM_04_credit_account_configurator_functions_revert_if_not_called_by_creditConfigurator() public {
Expand All @@ -368,13 +368,13 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
creditManager.changeContractAllowance(DUMB_ADDRESS, DUMB_ADDRESS);

evm.expectRevert(CallerNotConfiguratorException.selector);
creditManager.upgradeCreditFacade(DUMB_ADDRESS);
creditManager.setCreditFacade(DUMB_ADDRESS);

evm.expectRevert(CallerNotConfiguratorException.selector);
creditManager.upgradePriceOracle(DUMB_ADDRESS);
creditManager.setPriceOracle(DUMB_ADDRESS);

evm.expectRevert(CallerNotConfiguratorException.selector);
creditManager.setConfigurator(DUMB_ADDRESS);
creditManager.setCreditConfigurator(DUMB_ADDRESS);

evm.expectRevert(CallerNotConfiguratorException.selector);
creditManager.setMaxEnabledTokens(255);
Expand Down Expand Up @@ -1358,8 +1358,8 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
CreditManagerV3 cm = new CreditManagerV3(address(poolMock), address(withdrawManager));
cms.cr().addCreditManager(address(cm));

cm.upgradeCreditFacade(address(this));
cm.upgradePriceOracle(address(priceOracle));
cm.setCreditFacade(address(this));
cm.setPriceOracle(address(priceOracle));

evm.stopPrank();

Expand Down Expand Up @@ -1406,8 +1406,8 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
creditManager = new CreditManagerV3(address(poolMock), address(withdrawManager));
cms.cr().addCreditManager(address(creditManager));

creditManager.upgradeCreditFacade(address(this));
creditManager.upgradePriceOracle(address(priceOracle));
creditManager.setCreditFacade(address(this));
creditManager.setPriceOracle(address(priceOracle));

creditManager.setLiquidationThreshold(poolMock.underlyingToken(), 9300);
evm.stopPrank();
Expand Down Expand Up @@ -2088,22 +2088,22 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
// UPGRADE CONTRACTS
//

/// @dev [CM-57A]: upgradeCreditFacade updates Credit Facade correctly
function test_CM_57A_upgradeCreditFacade_updates_contract_correctly() public {
/// @dev [CM-57A]: setCreditFacade updates Credit Facade correctly
function test_CM_57A_setCreditFacade_updates_contract_correctly() public {
assertTrue(creditManager.creditFacade() != DUMB_ADDRESS, "creditFacade( is already the same");

evm.prank(CONFIGURATOR);
creditManager.upgradeCreditFacade(DUMB_ADDRESS);
creditManager.setCreditFacade(DUMB_ADDRESS);

assertEq(creditManager.creditFacade(), DUMB_ADDRESS, "creditFacade is not set correctly");
}

/// @dev [CM-57B]: upgradePriceOracle updates contract correctly
function test_CM_57_upgradePriceOracle_updates_contract_correctly() public {
/// @dev [CM-57B]: setPriceOracle updates contract correctly
function test_CM_57_setPriceOracle_updates_contract_correctly() public {
assertTrue(address(creditManager.priceOracle()) != DUMB_ADDRESS2, "priceOracle is already the same");

evm.prank(CONFIGURATOR);
creditManager.upgradePriceOracle(DUMB_ADDRESS2);
creditManager.setPriceOracle(DUMB_ADDRESS2);

assertEq(address(creditManager.priceOracle()), DUMB_ADDRESS2, "priceOracle is not set correctly");
}
Expand All @@ -2112,16 +2112,16 @@ contract CreditManagerTest is DSTest, ICreditManagerV3Events, BalanceHelper {
// SET CONFIGURATOR
//

/// @dev [CM-58]: setConfigurator sets creditConfigurator correctly and emits event
function test_CM_58_setConfigurator_sets_creditConfigurator_correctly_and_emits_event() public {
/// @dev [CM-58]: setCreditConfigurator sets creditConfigurator correctly and emits event
function test_CM_58_setCreditConfigurator_sets_creditConfigurator_correctly_and_emits_event() public {
assertTrue(creditManager.creditConfigurator() != DUMB_ADDRESS, "creditConfigurator is already the same");

evm.prank(CONFIGURATOR);

evm.expectEmit(true, false, false, false);
emit SetConfigurator(DUMB_ADDRESS);
emit SetCreditConfigurator(DUMB_ADDRESS);

creditManager.setConfigurator(DUMB_ADDRESS);
creditManager.setCreditConfigurator(DUMB_ADDRESS);

assertEq(creditManager.creditConfigurator(), DUMB_ADDRESS, "creditConfigurator is not set correctly");
}
Expand Down

0 comments on commit ff2af5c

Please sign in to comment.