Migrate neo-swaps pools to bounded storage #1253
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
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #1253 +/- ##
==========================================
+ Coverage 91.82% 91.89% +0.07%
==========================================
Files 190 191 +1
Lines 34682 34793 +111
==========================================
+ Hits 31847 31974 +127
+ Misses 2835 2819 -16
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
maltekliemann
added
s:review-needed
mergify
bot
added
s:in-progress
maltekliemann
added
s:review-needed
Chralt98
previously approved these changes
Feb 8, 2024
Comment on lines
+138
to
+141
| log::info!( | ||
| "MigratePoolReservesToBoundedBTreeMap: Post-upgrade pool count is {}!", | ||
| new_pool_count | ||
| ); |
There was a problem hiding this comment.
How many pools were shown on battery station and main-net? Just want to verify without running it myself.
|
This pull request is now in conflicts. Could you fix it @maltekliemann? 🙏 |
mergify
bot
added
s:revision-needed
maltekliemann
added
s:review-needed
mergify
bot
added
the
s:in-progress
maltekliemann
added
s:review-needed
sea212
reviewed
Apr 5, 2024
Comment on lines
1
to
27
| // Copyright 2023-2024 Forecasting Technologies LTD. | ||
| // | ||
| // This file is part of Zeitgeist. | ||
| // | ||
| // Zeitgeist is free software: you can redistribute it and/or modify it | ||
| // under the terms of the GNU General Public License as published by the | ||
| // Free Software Foundation, either version 3 of the License, or (at | ||
| // your option) any later version. | ||
| // | ||
| // Zeitgeist is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| // General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| use crate::consts::MAX_ASSETS; | ||
| use sp_runtime::traits::Get; | ||
|
|
||
| pub(crate) struct MaxAssets; | ||
|
|
||
| impl Get<u32> for MaxAssets { | ||
| fn get() -> u32 { | ||
| MAX_ASSETS | ||
| } | ||
| } |
There was a problem hiding this comment.
Why is that necessary? Why don't we use a Config type for that?
There was a problem hiding this comment.
I was worried about a misconfiguration. The thing is that there's a (hard-coded!) minimum spot price required when creating a pool, so there should be a maximum number of assets allowed, because if there are too many assets, it becomes impossible to keep all spot prices above the minimum spot price. I'll add a comment to the code.
There was a problem hiding this comment.
Seems a bit overkill to me to create a whole new file for that. I was thinking along the lines of putting the following line next to the constant:
pub type MaxAssets = frame_support::pallet_prelude::ConstU32<MAX_ASSETS>;…stpm/zeitgeist into mkl-neo-swaps-bounded-b-tree-map
mergify
bot
added
s:in-progress
maltekliemann
added
s:review-needed
sea212
previously approved these changes
Apr 8, 2024
Chralt98
reviewed
Apr 8, 2024
Comment on lines
+849
to
+853
| let asset_count_u16: u16 = | ||
| spot_prices.len().try_into().map_err(|_| Error::<T>::NarrowingConversion)?; | ||
| let asset_count_u32: u32 = asset_count_u16.into(); | ||
| ensure!(asset_count_u16 == market.outcomes(), Error::<T>::IncorrectVecLen); | ||
| ensure!(asset_count_u32 <= MaxAssets::get(), Error::<T>::AssetCountAboveMax); |
There was a problem hiding this comment.
You can use shadowing here if you like. I mean this:
let asset_count: u16 =
spot_prices.len().try_into().map_err(|_| Error::<T>::NarrowingConversion)?;
ensure!(asset_count == market.outcomes(), Error::<T>::IncorrectVecLen);
let asset_count: u32 = asset_count.into();
ensure!(asset_count <= MaxAssets::get(), Error::<T>::AssetCountAboveMax);Let me know if this doesn't work.
There was a problem hiding this comment.
Ah, you use it below... mhhh... then it's fine I guess.
Chralt98
previously approved these changes
Apr 8, 2024
maltekliemann
added
s:accepted
mergify
bot
added
s:review-needed
mergify
bot
added
s:in-progress
maltekliemann
added
s:review-needed
sea212
approved these changes
Apr 8, 2024
sea212
added
s:accepted
mergify
bot
added
s:review-needed
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.
What does it do?
Migrates neo-swaps pools from
BTreeMaptoBoundedBTreeMapto avoid potentially faulty manualMaxEncodedLenimplementations. Fixes #1214.What important points should reviewers know?
Is there something left for follow-up PRs?
What alternative implementations were considered?
Are there relevant PRs or issues?
References