From 60a03e38157ed8c64fab8efd073d72e183f17a7b Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Fri, 3 Dec 2021 13:44:40 +0100 Subject: [PATCH] fix: Clean code style of mocks --- contracts/mocks/helpers/MockPool.sol | 4 ++-- .../oracle/CLAggregators/MockAggregator.sol | 6 +++--- contracts/mocks/oracle/PriceOracle.sol | 20 +++++++++---------- .../tests/MockReserveInterestRateStrategy.sol | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contracts/mocks/helpers/MockPool.sol b/contracts/mocks/helpers/MockPool.sol index 01b32cd7c..7a59d63d4 100644 --- a/contracts/mocks/helpers/MockPool.sol +++ b/contracts/mocks/helpers/MockPool.sol @@ -15,8 +15,8 @@ contract MockPool { _addressesProvider = provider; } - function addReserveToReservesList(address _reserve) external { - _reserveList.push(_reserve); + function addReserveToReservesList(address reserve) external { + _reserveList.push(reserve); } function getReservesList() external view returns (address[] memory) { diff --git a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol index 0ad2fbe7c..d0726940f 100644 --- a/contracts/mocks/oracle/CLAggregators/MockAggregator.sol +++ b/contracts/mocks/oracle/CLAggregators/MockAggregator.sol @@ -6,9 +6,9 @@ contract MockAggregator { event AnswerUpdated(int256 indexed current, uint256 indexed roundId, uint256 timestamp); - constructor(int256 _initialAnswer) { - _latestAnswer = _initialAnswer; - emit AnswerUpdated(_initialAnswer, 0, block.timestamp); + constructor(int256 initialAnswer) { + _latestAnswer = initialAnswer; + emit AnswerUpdated(initialAnswer, 0, block.timestamp); } function latestAnswer() external view returns (int256) { diff --git a/contracts/mocks/oracle/PriceOracle.sol b/contracts/mocks/oracle/PriceOracle.sol index d110f22bc..d45a462b9 100644 --- a/contracts/mocks/oracle/PriceOracle.sol +++ b/contracts/mocks/oracle/PriceOracle.sol @@ -7,24 +7,24 @@ contract PriceOracle is IPriceOracle { mapping(address => uint256) prices; uint256 ethPriceUsd; - event AssetPriceUpdated(address _asset, uint256 _price, uint256 timestamp); - event EthPriceUpdated(uint256 _price, uint256 timestamp); + event AssetPriceUpdated(address asset, uint256 price, uint256 timestamp); + event EthPriceUpdated(uint256 price, uint256 timestamp); - function getAssetPrice(address _asset) external view override returns (uint256) { - return prices[_asset]; + function getAssetPrice(address asset) external view override returns (uint256) { + return prices[asset]; } - function setAssetPrice(address _asset, uint256 _price) external override { - prices[_asset] = _price; - emit AssetPriceUpdated(_asset, _price, block.timestamp); + function setAssetPrice(address asset, uint256 price) external override { + prices[asset] = price; + emit AssetPriceUpdated(asset, price, block.timestamp); } function getEthUsdPrice() external view returns (uint256) { return ethPriceUsd; } - function setEthUsdPrice(uint256 _price) external { - ethPriceUsd = _price; - emit EthPriceUpdated(_price, block.timestamp); + function setEthUsdPrice(uint256 price) external { + ethPriceUsd = price; + emit EthPriceUpdated(price, block.timestamp); } } diff --git a/contracts/mocks/tests/MockReserveInterestRateStrategy.sol b/contracts/mocks/tests/MockReserveInterestRateStrategy.sol index d8c757585..f7cdfc7ea 100644 --- a/contracts/mocks/tests/MockReserveInterestRateStrategy.sol +++ b/contracts/mocks/tests/MockReserveInterestRateStrategy.sol @@ -9,7 +9,7 @@ import {DataTypes} from '../../protocol/libraries/types/DataTypes.sol'; contract MockReserveInterestRateStrategy is IReserveInterestRateStrategy { uint256 public immutable OPTIMAL_UTILIZATION_RATE; uint256 public immutable EXCESS_UTILIZATION_RATE; - IPoolAddressesProvider public immutable addressesProvider; + IPoolAddressesProvider public immutable ADDRESSES_PROVIDER; uint256 internal immutable _baseVariableBorrowRate; uint256 internal immutable _variableRateSlope1; uint256 internal immutable _variableRateSlope2; @@ -31,7 +31,7 @@ contract MockReserveInterestRateStrategy is IReserveInterestRateStrategy { ) { OPTIMAL_UTILIZATION_RATE = optimalUtilizationRate; EXCESS_UTILIZATION_RATE = WadRayMath.RAY - optimalUtilizationRate; - addressesProvider = provider; + ADDRESSES_PROVIDER = provider; _baseVariableBorrowRate = baseVariableBorrowRate; _variableRateSlope1 = variableRateSlope1; _variableRateSlope2 = variableRateSlope2;