Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

post-rebase: fixed last conflicts remaining after rebase

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-05-31 13:44:41 +02:00
parent 0ebb815591
commit 33d582b4ec
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/interfaces/ILendingPoolConfigurator.sol
View File

@ -375,4 +375,3 @@ interface ILendingPoolConfigurator {
**/ **/
function isRiskAdmin(address admin) external view returns (bool); function isRiskAdmin(address admin) external view returns (bool);
} }
}

8
contracts/protocol/lendingpool/LendingPoolConfigurator.sol
View File

@ -59,7 +59,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
modifier onlyRiskOrPoolAdmins { modifier onlyRiskOrPoolAdmins {
require( require(
_riskAdmins[msg.sender] || addressesProvider.getPoolAdmin() == msg.sender, _riskAdmins[msg.sender] || _addressesProvider.getPoolAdmin() == msg.sender,
Errors.LPC_CALLER_NOT_RISK_OR_POOL_ADMIN Errors.LPC_CALLER_NOT_RISK_OR_POOL_ADMIN
); );
_; _;
@ -423,7 +423,11 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
} }
/// @inheritdoc ILendingPoolConfigurator /// @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); DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
currentConfig.setReserveFactor(reserveFactor); currentConfig.setReserveFactor(reserveFactor);

2
markets/matic/reservesConfigs.ts
View File

@ -92,8 +92,6 @@ export const strategyMATIC: IReserveParams = {
borrowCap: '0', borrowCap: '0',
supplyCap: '0', supplyCap: '0',
reserveFactor: '2000', reserveFactor: '2000',
borrowCap: '0',
supplyCap: '0',
}; };
export const strategyAAVE: IReserveParams = { export const strategyAAVE: IReserveParams = {

14
test-suites/test-aave/configurator.spec.ts
View File

@ -135,14 +135,8 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
expect(supplyCap).to.be.equal(strategyWETH.supplyCap); expect(supplyCap).to.be.equal(strategyWETH.supplyCap);
}); });
it('Pauses the ETH reserve by emergency admin', async () => { it('Pauses the ETH reserve by emergency admin', async () => {
const { const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
configurator, testEnv;
weth,
helpersContract,
addressesProvider,
users,
emergencyAdmin,
} = testEnv;
await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address); await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address);
const { const {
decimals, decimals,
@ -462,9 +456,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
it('Activates the ETH reserve for borrowing via risk admin', async () => { it('Activates the ETH reserve for borrowing via risk admin', async () => {
const { configurator, weth, helpersContract, riskAdmin } = testEnv; const { configurator, weth, helpersContract, riskAdmin } = testEnv;
await configurator await configurator.connect(riskAdmin.signer).enableBorrowingOnReserve(weth.address, '0', true);
.connect(riskAdmin.signer)
.enableBorrowingOnReserve(weth.address, MAX_BORROW_CAP, true);
const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address); const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
const { const {

2
test-suites/test-amm/configurator.spec.ts
View File

@ -156,7 +156,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
it('Activates the ETH reserve for borrowing', async () => { it('Activates the ETH reserve for borrowing', async () => {
const { configurator, weth, helpersContract } = testEnv; 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 { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
const { const {