Migrate pallet-nomination-pools and pallet-nomination-pools-runtime-api to use umbrella crate #7218
+65
−94
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
92 tasks
re-gius
added
R0-silent
|
Clean up files like |
gui1117
reviewed
Jan 29, 2025
| "sp-tracing?/std", | ||
| ] | ||
| runtime-benchmarks = [ | ||
| "frame-support/runtime-benchmarks", | ||
| "frame-system/runtime-benchmarks", | ||
| "pallet-balances?/runtime-benchmarks", |
There was a problem hiding this comment.
there is no frame/runtime-benchmarks?
| DefaultNoBound, PalletError, | ||
| }; | ||
| use frame_system::pallet_prelude::BlockNumberFor; | ||
|
|
| FixedPointNumber, Perbill, | ||
| }; | ||
| use sp_staking::{EraIndex, StakingInterface}; | ||
|
|
| @@ -2667,7 +2648,7 @@ pub mod pallet { | |||
| ) -> DispatchResult { | |||
| let mut bonded_pool = match ensure_root(origin.clone()) { | |||
| Ok(()) => BondedPool::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?, | |||
| Err(sp_runtime::traits::BadOrigin) => { | |||
| Err(_bad_origin) => { | |||
There was a problem hiding this comment.
why not keep the exact match here?
Suggested change
| Err(_bad_origin) => { | |
| Err(BadOrigin) => { |
| use frame_system::{EnsureSignedBy, RawOrigin}; | ||
| use sp_runtime::{BuildStorage, DispatchResult, FixedU128}; | ||
| use sp_staking::{ | ||
|
|
| FixedU128, | ||
| }; | ||
| use sp_staking::{Agent, DelegationInterface}; | ||
|
|
| pub use frame_support::{ | ||
| defensive, defensive_assert, ensure, | ||
| traits::{ | ||
| fungible::{Inspect, InspectFreeze, Mutate, MutateFreeze}, |
There was a problem hiding this comment.
I don't think we should import the fungible trait like this. they will collide with fungibles one.
| }; | ||
|
|
||
| pub use frame_support::traits::tokens::{Fortitude::Polite, Preservation::Expendable, Balance}; |
There was a problem hiding this comment.
IMO importing enum variant is too much, we should import only Fortitude and Preservation.
| OneSessionHandler, RankedMembers, RankedMembersSwapHandler, StorageVersion, | ||
| UncheckedOnRuntimeUpgrade, VariantCountOf, | ||
| }, | ||
| PalletError, PalletId, PartialEqNoBound |
There was a problem hiding this comment.
As a note, I think PartialEqNoBound is already imported in derive.
| @@ -326,9 +339,11 @@ pub mod testing_prelude { | |||
| /// Other helper macros from `frame_support` that help with asserting in tests. | |||
| pub use frame_support::{ | |||
| assert_err, assert_err_ignore_postinfo, assert_error_encoded_size, assert_noop, assert_ok, | |||
| assert_storage_noop, ensure, hypothetically, storage_alias, | |||
| assert_storage_noop, hypothetically, storage_alias, DefaultNoBound, | |||
There was a problem hiding this comment.
why is ensure removed? DefaultNoBound should already be in prelude through derive IIRC
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.
Part of #6504
Polkadot Address: 121HJWZtD13GJQPD82oEj3gSeHqsRYm1mFgRALu4L96kfPD1