refactor: remove old names, use new solidity features, add file for poolClosing #567
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xmxanuel
approved these changes
May 27, 2021
| @@ -37,4 +37,4 @@ dapp test -m ':ContractName\.' | |||
| For deploying the Tinlake contracts to mainnet or a testnet, view our deploy scripts in [Tinlake Deploy](https://github.com/centrifuge/tinlake-deploy). | |||
|
|
|||
| ## Community | |||
| Join our public Slack channel: [Centrifuge Slack](http://centrifuge.io/slack). | |||
| Join our public Discord: [Centrifuge Discord](https://centrifuge.io/discord/). | |||
src/borrower/feed/navfeed.sol
Outdated
| @@ -156,7 +155,7 @@ contract NAVFeed is BaseNFTFeed, Interest, Buckets, FixedPoint { | |||
| // On borrow: the discounted future value of the asset is computed based on the loan amount and addeed to the bucket with the according maturity Date | |||
| function _borrow(uint loan, uint amount) internal returns(uint navIncrease) { | |||
| // ceiling check uses existing loan debt | |||
| require(ceiling(loan) >= safeAdd(borrowed[loan], amount), "borrow-amount-too-high"); | |||
| require(ceiling(loan) >= amount, "borrow-amount-too-high"); | |||
There was a problem hiding this comment.
I am wondering if we actually need both methods:
function ceiling(uint loan) public view returns (uint) {
if (borrowed[loan] > currentCeiling(loan)) {
return 0;
}
return safeSub(currentCeiling(loan), borrowed[loan]);
}
function currentCeiling(uint loan) public view returns(uint) {
bytes32 nftID_ = nftID(loan);
return rmul(nftValues[nftID_], ceilingRatio[risk[nftID_]]);
}We only use ceiling here it seems. We could just use currentCeiling and remove the ceiling function.
There was a problem hiding this comment.
I think this requires a bit more investigation whether we're not relying on either externally. I'll add a separate ticket for this.
| @@ -23,7 +23,7 @@ contract NAVTest is DSTest, Math { | |||
| Hevm hevm; | |||
|
|
|||
| function setUp() public { | |||
| hevm = Hevm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D); | |||
| hevm = Hevm(HEVM_ADDRESS); | |||
Co-authored-by: Manuel Polzhofer <[email protected]>
Co-authored-by: Manuel Polzhofer <[email protected]>
hieronx
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
distributor=>reserverename (closes rename the distributor depenency to reserve in the shelf contract #563)epochTicker=>coordinatorrenameds-notewith custom eventsuint(-1)=>type(uint256).maxhevm = Hevm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);=>hevm = Hevm(HEVM_ADDRESS);file()forpoolClosingin coordinator