Skip to content

Commit

Permalink
Merge pull request #1496 from morpho-dao/fix/litteral-formatting
Browse files Browse the repository at this point in the history
Uniformized litteral formatting
  • Loading branch information
Rubilmax committed Dec 4, 2022
2 parents 2096975 + 83bfc7b commit f228847
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion contracts/aave-v2/IncentivesVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract IncentivesVault is IIncentivesVault, Ownable {

/// STORAGE ///

uint256 public constant MAX_BASIS_POINTS = 10_000;
uint256 public constant MAX_BASIS_POINTS = 100_00;

IMorpho public immutable morpho; // The address of the main Morpho contract.
ERC20 public immutable rewardToken; // The reward token.
Expand Down
4 changes: 2 additions & 2 deletions contracts/aave-v2/MorphoStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ abstract contract MorphoStorage is OwnableUpgradeable, ReentrancyGuardUpgradeabl

uint8 public constant NO_REFERRAL_CODE = 0;
uint8 public constant VARIABLE_INTEREST_MODE = 2;
uint16 public constant MAX_BASIS_POINTS = 10_000; // 100% in basis points.
uint256 public constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 5_000; // 50% in basis points.
uint16 public constant MAX_BASIS_POINTS = 100_00; // 100% in basis points.
uint256 public constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 50_00; // 50% in basis points.
uint256 public constant HEALTH_FACTOR_LIQUIDATION_THRESHOLD = 1e18; // Health factor below which the positions can be liquidated.
uint256 public constant MAX_NB_OF_MARKETS = 128;
bytes32 public constant BORROWING_MASK =
Expand Down
2 changes: 1 addition & 1 deletion contracts/aave-v2/lens/LensStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import "../libraries/InterestRatesModel.sol";
abstract contract LensStorage {
/// CONSTANTS & IMMUTABLES ///

uint16 public constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 5_000; // 50% in basis points.
uint16 public constant DEFAULT_LIQUIDATION_CLOSE_FACTOR = 50_00; // 50% in basis points.
uint256 public constant HEALTH_FACTOR_LIQUIDATION_THRESHOLD = 1e18; // Health factor below which the positions can be liquidated.

address public constant ST_ETH = 0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84;
Expand Down
2 changes: 1 addition & 1 deletion contracts/compound/IncentivesVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract IncentivesVault is IIncentivesVault, Ownable {

/// STORAGE ///

uint256 public constant MAX_BASIS_POINTS = 10_000;
uint256 public constant MAX_BASIS_POINTS = 100_00;

IMorpho public immutable morpho; // The address of the main Morpho contract.
IComptroller public immutable comptroller; // Compound's comptroller proxy.
Expand Down
2 changes: 1 addition & 1 deletion contracts/compound/MorphoStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ abstract contract MorphoStorage is OwnableUpgradeable, ReentrancyGuardUpgradeabl
/// GLOBAL STORAGE ///

uint8 public constant CTOKEN_DECIMALS = 8; // The number of decimals for cToken.
uint16 public constant MAX_BASIS_POINTS = 10_000; // 100% in basis points.
uint16 public constant MAX_BASIS_POINTS = 100_00; // 100% in basis points.
uint256 public constant WAD = 1e18;

uint256 public maxSortedUsers; // The max number of users to sort in the data structure.
Expand Down
2 changes: 1 addition & 1 deletion contracts/compound/lens/LensStorage.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
abstract contract LensStorage is Initializable {
/// STORAGE ///

uint256 public constant MAX_BASIS_POINTS = 10_000; // 100% (in basis points).
uint256 public constant MAX_BASIS_POINTS = 100_00; // 100% (in basis points).
uint256 public constant WAD = 1e18;

IMorpho public morpho;
Expand Down
2 changes: 1 addition & 1 deletion contracts/compound/libraries/InterestRatesModel.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ library InterestRatesModel {
using PercentageMath for uint256;
using CompoundMath for uint256;

uint256 public constant MAX_BASIS_POINTS = 10_000; // 100% (in basis points).
uint256 public constant MAX_BASIS_POINTS = 100_00; // 100% (in basis points).
uint256 public constant WAD = 1e18;

/// STRUCTS ///
Expand Down

0 comments on commit f228847

Please sign in to comment.