This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Remove state migration from westend runtime. #6737
Merged
Conversation
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
bkchr
approved these changes
Feb 17, 2023
Member
bkchr
left a comment
bkchr
left a comment
There was a problem hiding this comment.
The pallet stored data? We should write some cleanup function.
Contributor
Author
|
Oh, did not think about it 👍 . The data stored is small though (just the current position) so could make sense to keep it just to know it was migrated. But I think I will clean it up. |
This reverts commit b1d55c6.
Contributor
Author
|
I did write a clean up function, but did not find a good way to also remove the dependency from the runtime. |
Contributor
Author
|
I am hesitant to just hardcode the trie storage key of the storage value items (and remove directly with the storage api) and remove the module. |
bkchr
reviewed
Feb 17, 2023
runtime/westend/src/lib.rs
Outdated
Comment on lines
1927
to
1929
| MigrationProcess::<Runtime>::kill(); | ||
| AutoLimits::<Runtime>::kill(); | ||
| SignedMigrationMaxLimits::<Runtime>::kill(); |
Member
There was a problem hiding this comment.
You can use storage_alias to have the definition of them without including the pallet.
bkchr
reviewed
Feb 17, 2023
runtime/westend/src/lib.rs
Outdated
Comment on lines
1903
to
1918
| struct Pallet<T>(sp_std::marker::PhantomData<T>); | ||
|
|
||
| impl<T> frame_support::traits::PalletInfoAccess for Pallet<T> { | ||
| fn index() -> usize { | ||
| 35 | ||
| } | ||
| fn name() -> &'static str { | ||
| "StateTrieMigration" | ||
| } | ||
| fn module_name() -> &'static str { | ||
| "pallet_state_trie_migration" | ||
| } | ||
| fn crate_version() -> frame_support::traits::CrateVersion { | ||
| frame_support::traits::CrateVersion { major: 4u16, minor: 0u8, patch: 0u8 } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| struct Pallet<T>(sp_std::marker::PhantomData<T>); | |
| impl<T> frame_support::traits::PalletInfoAccess for Pallet<T> { | |
| fn index() -> usize { | |
| 35 | |
| } | |
| fn name() -> &'static str { | |
| "StateTrieMigration" | |
| } | |
| fn module_name() -> &'static str { | |
| "pallet_state_trie_migration" | |
| } | |
| fn crate_version() -> frame_support::traits::CrateVersion { | |
| frame_support::traits::CrateVersion { major: 4u16, minor: 0u8, patch: 0u8 } | |
| } | |
| } |
runtime/westend/src/lib.rs
Outdated
| } | ||
|
|
||
| #[storage_alias] | ||
| type AutoLimits<T> = StorageValue<Pallet<T>, Option<MigrationLimits>, ValueQuery>; |
Member
There was a problem hiding this comment.
Suggested change
| type AutoLimits<T> = StorageValue<Pallet<T>, Option<MigrationLimits>, ValueQuery>; | |
| type AutoLimits = StorageValue<StateTrieMigration, Option<MigrationLimits>, ValueQuery>; |
runtime/westend/src/lib.rs
Outdated
Comment on lines
1927
to
1930
| type MigrationProcess<T> = StorageValue<Pallet<T>, u32, ValueQuery>; | ||
|
|
||
| #[storage_alias] | ||
| type SignedMigrationMaxLimits<T> = StorageValue<Pallet<T>, MigrationLimits, OptionQuery>; |
Member
There was a problem hiding this comment.
Suggested change
| type MigrationProcess<T> = StorageValue<Pallet<T>, u32, ValueQuery>; | |
| #[storage_alias] | |
| type SignedMigrationMaxLimits<T> = StorageValue<Pallet<T>, MigrationLimits, OptionQuery>; | |
| type MigrationProcess = StorageValue<StateTrieMigration, u32, ValueQuery>; | |
| #[storage_alias] | |
| type SignedMigrationMaxLimits = StorageValue<StateTrieMigration, MigrationLimits, OptionQuery>; |
cheme
added
A0-please_review
ggwpez
approved these changes
Feb 22, 2023
| // one to avoid the trait constraint on T. | ||
| // Since we only use `kill` it is fine. | ||
| #[storage_alias] | ||
| type MigrationProcess = StorageValue<StateTrieMigration, u32, ValueQuery>; |
Member
There was a problem hiding this comment.
I think you can also just delete the pallet prefix instead of defining each alias but this also works obviously.
Contributor
Author
There was a problem hiding this comment.
Thanks for the tip, did not think about this approach, with 3 value only I will still keep this version.
Contributor
Author
|
bot merge |
ggwpez
added
the
E0-runtime_migration
ordian
pushed a commit
that referenced
this pull request
Mar 16, 2023
* master: (98 commits) Ensure max_weight is assigned properly in AllowTopPaidExecutionFrom (#6787) Explicitly Handling ProvisionableData Cases (#6757) Companion for Substrate#12520 (#6730) Revert back to bare metal runners for weights generation (#6762) Improve XCM fuzzer (#6190) Corrected weight trader comment (#6752) clean up executed migrations (#6763) Remove state migration from westend runtime. (#6737) polkadot companion #12608 (Pools claim permissions) (#6753) Add Turboflakes bootnodes to Polkadot, Kusama and Westend (#6628) Companion for substrate#13284 (#6653) Companion for Substrate #13410: Introduce EnsureOrigin to democracy.propose (#6750) `BlockId` removal: `BlockBuilderProvider::new_block_at` (#6734) Companion PR for PR#13119 (#6683) Companion for Substrate#13411: frame/beefy: prune entries in set id session mapping (#6743) `BlockId` removal: refactor of runtime API (#6721) Fix auction bench (#6747) Use PVF code paired with executor params wherever possible (#6742) Retire `OldV1SessionInfo` (#6744) Companion for substrate #13121 - BEEFY Equivocations support (#6593) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
State migration did pass on westend and can be remove from the runtime.