FI v2: refactor without states #1698
Merged
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
|
Currently compiling with |
lemunozm
force-pushed
the
fi/without-inverse-swaps
branch
from
42f31b0 to
a79bdab
Compare
lemunozm
added
P7-asap
wischli
previously approved these changes
Jan 29, 2024
Comment on lines
+77
to
+85
| pub type SwapOf<T> = Swap<<T as Config>::Balance, <T as Config>::CurrencyId>; | ||
| pub type TrancheIdOf<T> = <<T as Config>::PoolInspect as cfg_traits::PoolInspect< | ||
| <T as frame_system::Config>::AccountId, | ||
| <T as Config>::CurrencyId, | ||
| >>::TrancheId; | ||
| pub type PoolIdOf<T> = <<T as Config>::PoolInspect as cfg_traits::PoolInspect< | ||
| <T as frame_system::Config>::AccountId, | ||
| <T as Config>::CurrencyId, | ||
| >>::PoolId; |
There was a problem hiding this comment.
Thanks for trimming down the pallet even more!
* tests: fix foreign investments v2 * chore: expose ForeignIdToSwapId storage * fix: remove events * chore: add swap_id_from * refactor: use give_pool_role
wischli
approved these changes
Jan 29, 2024
4 tasks
|
Thanks again @wischli for all your work, help, support, and eyes here, and for taking care of all border cases in the previous implementation! 🙌🏻 |
|
Let's keeping the previous branch by now 🙏🏻 |
wischli
added a commit
that referenced
this pull request
Jan 29, 2024
* increase & decrease investments * add rest of methods * remove unused code * generalize swapping * Create DecreaseForeignInvestment event * ForeignInvestment trait fully implemented * notify status for fulfilling swaps * simplify storages * implements collected part * minor cleanings and renamings * minor rename * collection refactors * protect agains 0 investment changes * Events computed in both swap directions * protect againts different foreign currency * minor comment * add some notes * fix notify_swap_done * BaseInfo to extract common parts * minor rename * Remove inverse swap optimization * William suggestions * fix redemption tranche tokens * fix collected redemption * minor notes * simplify and collected redemption * fix decrease and fix error in amount denominations * fix redemption condition * minor fixes to mirror legacy implementation * total to pending tranche tokens * determine pool currency from investment id * apply William review * Use apply swap to cancel inverse orders * fix decrement issue * fix apply_swap issue * minor fix * minor foreign trait simplification * minor simplifications. mock compiling * add testing for swaps * add some tests. Fix issue when decreasing after increasing * add tests, remove increment/decrement check * fix amount_reminder for decrease msng, adding the pending increasing amount * add error to handle too much decrease * fulfill test working * decrease after fulfill works * remove inverse swap notifications * Extract notifications from mutable closures * full investment test * collect investment working * minor refactorizations * logic moved to Info structures * split in files * add complex decrease test * correct pending redemption calculation * better swap done split * Improve readability for notifications/swaps * minor renames * add some docs * better naming SwapDone * remove field from InvestmentInfo, computed now from the state * bypassing swapping for the same currencies * test collect redemptions with swaps * nit * chore: enable runtime compilation * chore: expose FI hook impls * clean unused dependencies * remove old benchmark * reduce Config associated types * adapt other tests to last trait changes * fix investment mock * fix clippy issues * fix complex type clippy issues * avoid failing the notification when the investment is not found * fix redemption collection denomination * fix clippy * tests: fix FI v2 integration (#1700) * tests: fix foreign investments v2 * chore: expose ForeignIdToSwapId storage * fix: remove events * chore: add swap_id_from * refactor: use give_pool_role --------- Co-authored-by: William Freudenberger <[email protected]>
4 tasks
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
The main idea of this PR is to remove states to easier the adoption of #1674.
Crate organization
swaps.rs: It only focuses on making swaps. Doesn't know about anyInfotype or info Storage. It only reads the storage related to the swap ids. Actually, this file could be moved to its own pallet with the storage Ids if we need swapping for other purposes in the future.entities.rs: Defines theInvestmentInfoandRedemptionInfowith some methods that mutate their fields. Only these methods can mutate the internal states of theInfotypes. Higher layers should only read the content and never mutateInfofields directly. This is the low-level logic.impls.rs: The interface to handle FI, through the pallet or through the Hooks. The higher logic level "easier to follow"Pending work
integration-tests: tests: fix FI v2 integration #1700