Investments: simplify constraints and remove InvestmentProperties trait #1571
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
lemunozm
added
Q3-medium
lemunozm
requested review from
NunoAlexandre,
cdamian,
wischli and
mustermeiszer
lemunozm
force-pushed
the
investments/simplify-constraints
branch
from
2392851 to
bf1224f
Compare
lemunozm
commented
Sep 27, 2023
| @@ -595,7 +572,7 @@ where | |||
| amount, | |||
| })?; | |||
|
|
|||
| let info = T::Accountant::info(investment_id).map_err(|_| Error::<T>::UnknownInvestment)?; | |||
| let _ = T::Accountant::info(investment_id).map_err(|_| Error::<T>::UnknownInvestment)?; | |||
There was a problem hiding this comment.
Actually, this line could be removed to save a read access to the database, but there is a test that checks for the error UnknownInvestment. If removed a future Accountant::transfer() fails with a different error but I think the logic would be still ok
| @@ -662,7 +638,7 @@ where | |||
| who: T::AccountId, | |||
| investment_id: T::InvestmentId, | |||
| ) -> DispatchResultWithPostInfo { | |||
| let info = T::Accountant::info(investment_id).map_err(|_| Error::<T>::UnknownInvestment)?; | |||
| let _ = T::Accountant::info(investment_id).map_err(|_| Error::<T>::UnknownInvestment)?; | |||
| @@ -955,7 +928,7 @@ where | |||
| &mut total_order.amount, | |||
| )?; | |||
|
|
|||
| T::Accountant::transfer(info.id(), send, recv, transfer_amount) | |||
| T::Accountant::transfer(investment_id, send, recv, transfer_amount) | |||
There was a problem hiding this comment.
info.id() and investment_id always match with the same value, so we can save from using info in some places
mustermeiszer
approved these changes
Sep 27, 2023
|
Ok! Happy to revert some parts if needed in the future. Note that the |
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.
Description
Some simplifications regarding investment info/properties. Slack conversation
Changes and Descriptions
InvestmentPropertiestrait. Now, the typeInvestmentInfois used directly (which I think simplifies some parts)wherebound everywhere the investment pallets is used to determine the correctInvestmentInfo(this simplifies things for future integration tests)