Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add named returns where missing (c4 #25) #43

Merged
merged 4 commits into from
Dec 12, 2021
Merged

fix: Add named returns where missing (c4 #25) #43

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35fbbcb
chore: Remove TODO on pullFunds (c4 #10)
deluca-mike Dec 12, 2021
e5f0d2e
chore: strict 0.8.7 (c4 #23)
deluca-mike Dec 12, 2021
b97df8a
fix: Add named returns where missing (c4 #25)
deluca-mike Dec 12, 2021
2da2d75
Merge branch 'main' into sc-4292-c4-issue-25-add-named-return-to-pool…
Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions contracts/DebtLocker.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ contract DebtLocker is IDebtLocker, DebtLockerStorage, MapleProxied {
return oracleAmount > minRatioAmount ? oracleAmount : minRatioAmount;
}

function implementation() external view override returns (address) {
function implementation() external view override returns (address implementation_) {
return _implementation();
}

Expand Down Expand Up @@ -279,7 +279,7 @@ contract DebtLocker is IDebtLocker, DebtLockerStorage, MapleProxied {
return _pool;
}

function poolDelegate() external override view returns(address) {
function poolDelegate() external override view returns (address poolDelegate_) {
return _getPoolDelegate();
}

Expand All @@ -299,15 +299,15 @@ contract DebtLocker is IDebtLocker, DebtLockerStorage, MapleProxied {
/*** Internal View Functions ***/
/*******************************/

function _getGlobals() internal view returns (address) {
function _getGlobals() internal view returns (address globals_) {
return IPoolFactoryLike(IPoolLike(_pool).superFactory()).globals();
}

function _getPoolDelegate() internal view returns(address) {
function _getPoolDelegate() internal view returns(address poolDelegate_) {
return IPoolLike(_pool).poolDelegate();
}

function _isLiquidationActive() internal view returns (bool) {
function _isLiquidationActive() internal view returns (bool isActive_) {
return (_liquidator != address(0)) && (IERC20Like(IMapleLoanLike(_loan).collateralAsset()).balanceOf(_liquidator) > 0);
}

Expand Down