mirror of
https://github.com/Instadapp/aave-protocol-v2.git
synced 2024-07-29 21:47:30 +00:00
post-rebase: fixed last conflicts remaining after rebase
This commit is contained in:
parent
0ebb815591
commit
33d582b4ec
|
@ -375,4 +375,3 @@ interface ILendingPoolConfigurator {
|
|||
**/
|
||||
function isRiskAdmin(address admin) external view returns (bool);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
|
|||
|
||||
modifier onlyRiskOrPoolAdmins {
|
||||
require(
|
||||
_riskAdmins[msg.sender] || addressesProvider.getPoolAdmin() == msg.sender,
|
||||
_riskAdmins[msg.sender] || _addressesProvider.getPoolAdmin() == msg.sender,
|
||||
Errors.LPC_CALLER_NOT_RISK_OR_POOL_ADMIN
|
||||
);
|
||||
_;
|
||||
|
@ -423,7 +423,11 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
|
|||
}
|
||||
|
||||
/// @inheritdoc ILendingPoolConfigurator
|
||||
function setReserveFactor(address asset, uint256 reserveFactor) external override onlyRiskOrPoolAdmins {
|
||||
function setReserveFactor(address asset, uint256 reserveFactor)
|
||||
external
|
||||
override
|
||||
onlyRiskOrPoolAdmins
|
||||
{
|
||||
DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
|
||||
|
||||
currentConfig.setReserveFactor(reserveFactor);
|
||||
|
|
|
@ -92,8 +92,6 @@ export const strategyMATIC: IReserveParams = {
|
|||
borrowCap: '0',
|
||||
supplyCap: '0',
|
||||
reserveFactor: '2000',
|
||||
borrowCap: '0',
|
||||
supplyCap: '0',
|
||||
};
|
||||
|
||||
export const strategyAAVE: IReserveParams = {
|
||||
|
|
|
@ -135,14 +135,8 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
|
|||
expect(supplyCap).to.be.equal(strategyWETH.supplyCap);
|
||||
});
|
||||
it('Pauses the ETH reserve by emergency admin', async () => {
|
||||
const {
|
||||
configurator,
|
||||
weth,
|
||||
helpersContract,
|
||||
addressesProvider,
|
||||
users,
|
||||
emergencyAdmin,
|
||||
} = testEnv;
|
||||
const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
|
||||
testEnv;
|
||||
await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address);
|
||||
const {
|
||||
decimals,
|
||||
|
@ -462,9 +456,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
|
|||
|
||||
it('Activates the ETH reserve for borrowing via risk admin', async () => {
|
||||
const { configurator, weth, helpersContract, riskAdmin } = testEnv;
|
||||
await configurator
|
||||
.connect(riskAdmin.signer)
|
||||
.enableBorrowingOnReserve(weth.address, MAX_BORROW_CAP, true);
|
||||
await configurator.connect(riskAdmin.signer).enableBorrowingOnReserve(weth.address, '0', true);
|
||||
const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
|
||||
|
||||
const {
|
||||
|
|
|
@ -156,7 +156,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
|
|||
|
||||
it('Activates the ETH reserve for borrowing', async () => {
|
||||
const { configurator, weth, helpersContract } = testEnv;
|
||||
await configurator.enableBorrowingOnReserve(weth.address, MAX_BORROW_CAP, true);
|
||||
await configurator.enableBorrowingOnReserve(weth.address, '0', true);
|
||||
const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
|
||||
|
||||
const {
|
||||
|
|
Loading…
Reference in New Issue
Block a user