-
Notifications
You must be signed in to change notification settings - Fork 287
Refactor childkeys/parentkeys, add migration to clean state #2116
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
51671de
Refactor childkeys/parentkeys, add migration to clean state
gztensor 21b9671
Move and document set_childkeys and set_parentkeys
gztensor 41d2207
Unignore errors in load_child_parent_relations
gztensor 765808d
Extend test_set_child_keys_empty_vector_clears_storage to parent keys
gztensor 522d744
Merge branch 'devnet-ready' into fix/child-parent-setting
gztensor d0214db
Remove .expect from set_children.rs
gztensor fdca1c1
Merge branch 'devnet-ready' into fix/child-parent-setting
gztensor 1b9eb7d
Address code review comments
gztensor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| use super::*; | ||
| use alloc::string::String; | ||
|
|
||
| pub fn migrate_fix_childkeys<T: Config>() -> Weight { | ||
| let migration_name = b"migrate_fix_childkeys".to_vec(); | ||
| let mut weight = T::DbWeight::get().reads(1); | ||
|
|
||
| if HasMigrationRun::<T>::get(&migration_name) { | ||
| log::info!( | ||
| "Migration '{:?}' has already run. Skipping.", | ||
| String::from_utf8_lossy(&migration_name) | ||
| ); | ||
| return weight; | ||
| } | ||
|
|
||
| log::info!( | ||
| "Running migration '{}'", | ||
| String::from_utf8_lossy(&migration_name) | ||
| ); | ||
|
|
||
| //////////////////////////////////////////////////////// | ||
| // Actual migration | ||
|
|
||
| Pallet::<T>::clean_zero_childkey_vectors(&mut weight); | ||
| Pallet::<T>::clean_zero_parentkey_vectors(&mut weight); | ||
| Pallet::<T>::clean_self_loops(&mut weight); | ||
| Pallet::<T>::repair_child_parent_consistency(&mut weight); | ||
|
|
||
| //////////////////////////////////////////////////////// | ||
|
|
||
| HasMigrationRun::<T>::insert(&migration_name, true); | ||
| weight = weight.saturating_add(T::DbWeight::get().writes(1)); | ||
|
|
||
| log::info!( | ||
| target: "runtime", | ||
| "Migration '{}' completed successfully.", | ||
| String::from_utf8_lossy(&migration_name) | ||
| ); | ||
| weight | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you consider iterating through the child and parent key maps once and passing collected values into the substeps?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but after
clean_zero_childkey_vectorsthe number of keys in both maps is significantly reduced, so it is not worth the added complexity. Also, we've done heavier migrations in the past, so this one will pass.