Skip to content

Commit

Permalink
feat: Rename LendingRateOracle to RateOracle in contracts
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelmtzinf committed Jul 29, 2021
1 parent 680f2c7 commit 49f14d3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions contracts/deployments/StableAndVariableTokensHelper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;

import {StableDebtToken} from '../protocol/tokenization/StableDebtToken.sol';
import {VariableDebtToken} from '../protocol/tokenization/VariableDebtToken.sol';
import {LendingRateOracle} from '../mocks/oracle/LendingRateOracle.sol';
import {RateOracle} from '../mocks/oracle/RateOracle.sol';
import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
import {StringLib} from './StringLib.sol';

Expand Down Expand Up @@ -34,14 +34,14 @@ contract StableAndVariableTokensHelper is Ownable {
require(assets.length == rates.length, 'Arrays not same length');

for (uint256 i = 0; i < assets.length; i++) {
// LendingRateOracle owner must be this contract
LendingRateOracle(oracle).setMarketBorrowRate(assets[i], rates[i]);
// RateOracle owner must be this contract
RateOracle(oracle).setMarketBorrowRate(assets[i], rates[i]);
}
}

function setOracleOwnership(address oracle, address admin) external onlyOwner {
require(admin != address(0), 'owner can not be zero');
require(LendingRateOracle(oracle).owner() == address(this), 'helper is not owner');
LendingRateOracle(oracle).transferOwnership(admin);
require(RateOracle(oracle).owner() == address(this), 'helper is not owner');
RateOracle(oracle).transferOwnership(admin);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
pragma solidity 0.6.12;

/**
* @title ILendingRateOracle interface
* @title IRateOracle interface
* @notice Interface for the Aave borrow rate oracle. Provides the average market borrow rate to be used as a base for the stable borrow rate calculations
**/

interface ILendingRateOracle {
interface IRateOracle {
/**
@dev returns the market borrow rate in ray
**/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: agpl-3.0
pragma solidity 0.6.12;

import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol';
import {IRateOracle} from '../../interfaces/IRateOracle.sol';
import {Ownable} from '../../dependencies/openzeppelin/contracts/Ownable.sol';

contract LendingRateOracle is ILendingRateOracle, Ownable {
contract RateOracle is IRateOracle, Ownable {
mapping(address => uint256) borrowRates;
mapping(address => uint256) liquidityRates;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {IReserveInterestRateStrategy} from '../../interfaces/IReserveInterestRat
import {WadRayMath} from '../libraries/math/WadRayMath.sol';
import {PercentageMath} from '../libraries/math/PercentageMath.sol';
import {ILendingPoolAddressesProvider} from '../../interfaces/ILendingPoolAddressesProvider.sol';
import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol';
import {IRateOracle} from '../../interfaces/IRateOracle.sol';
import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';

/**
Expand Down Expand Up @@ -190,7 +190,7 @@ contract DefaultReserveInterestRateStrategy is IReserveInterestRateStrategy {
? 0
: vars.totalDebt.rayDiv(availableLiquidity.add(vars.totalDebt));

vars.currentStableBorrowRate = ILendingRateOracle(addressesProvider.getLendingRateOracle())
vars.currentStableBorrowRate = IRateOracle(addressesProvider.getLendingRateOracle())
.getMarketBorrowRate(reserve);

if (vars.utilizationRate > OPTIMAL_UTILIZATION_RATE) {
Expand Down

0 comments on commit 49f14d3

Please sign in to comment.