Skip to content

Commit

Permalink
Merge branch 'development' into locked
Browse files Browse the repository at this point in the history
  • Loading branch information
remedcu committed May 12, 2021
2 parents bbc5a97 + ce86cfd commit a61194d
Show file tree
Hide file tree
Showing 20 changed files with 2,218 additions and 806 deletions.
449 changes: 0 additions & 449 deletions contracts/connectors/loantoken/LoanTokenLogicDai.sol

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/connectors/loantoken/LoanTokenLogicStandard.sol
Original file line number Diff line number Diff line change
Expand Up @@ -919,17 +919,6 @@ contract LoanTokenLogicStandard is LoanTokenSettingsLowerAdmin {
}
}

function _adjustValue(
uint256 interestRate,
uint256 maxDuration,
uint256 marginAmount
) internal pure returns (uint256) {
return
maxDuration != 0
? interestRate.mul(WEI_PERCENT_PRECISION).mul(maxDuration).div(365 days).div(marginAmount).add(WEI_PERCENT_PRECISION)
: WEI_PERCENT_PRECISION;
}

/**
* used to read externally from the smart contract to see if a function is paused
* returns a bool
Expand Down
Loading

0 comments on commit a61194d

Please sign in to comment.