From bdc5cdb34da685a5f7edb9b4522a8bbdf22e17b0 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:07:08 +0530 Subject: [PATCH 01/67] Remove use of trait Store from staking pallet --- frame/staking/src/migrations.rs | 2 +- frame/staking/src/pallet/impls.rs | 4 +-- frame/staking/src/pallet/mod.rs | 5 ++-- frame/staking/src/slashing.rs | 34 ++++++++++++------------ frame/staking/src/tests.rs | 44 +++++++++++++++---------------- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/frame/staking/src/migrations.rs b/frame/staking/src/migrations.rs index 3c33ae2a35d62..23bcfa4398627 100644 --- a/frame/staking/src/migrations.rs +++ b/frame/staking/src/migrations.rs @@ -265,7 +265,7 @@ pub mod v10 { impl OnRuntimeUpgrade for MigrateToV10 { fn on_runtime_upgrade() -> frame_support::weights::Weight { if StorageVersion::::get() == ObsoleteReleases::V9_0_0 { - let pending_slashes = as Store>::UnappliedSlashes::iter().take(512); + let pending_slashes = UnappliedSlashes::::iter().take(512); for (era, slashes) in pending_slashes { for slash in slashes { // in the old slashing scheme, the slash era was the key at which we read diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs index 78c9a51bc829c..760345e8ddb28 100644 --- a/frame/staking/src/pallet/impls.rs +++ b/frame/staking/src/pallet/impls.rs @@ -682,7 +682,7 @@ impl Pallet { /// Apply previously-unapplied slashes on the beginning of a new era, after a delay. fn apply_unapplied_slashes(active_era: EraIndex) { - let era_slashes = ::UnappliedSlashes::take(&active_era); + let era_slashes = UnappliedSlashes::::take(&active_era); log!( debug, "found {} slashes scheduled to be executed in era {:?}", @@ -1369,7 +1369,7 @@ where active_era, slash_era + slash_defer_duration + 1, ); - ::UnappliedSlashes::mutate( + UnappliedSlashes::::mutate( slash_era.saturating_add(slash_defer_duration).saturating_add(One::one()), move |for_later| for_later.push(unapplied), ); diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs index a030538878241..d8f1855da4bc0 100644 --- a/frame/staking/src/pallet/mod.rs +++ b/frame/staking/src/pallet/mod.rs @@ -68,7 +68,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(13); #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); @@ -1452,7 +1451,7 @@ pub mod pallet { ensure!(!slash_indices.is_empty(), Error::::EmptyTargets); ensure!(is_sorted_and_unique(&slash_indices), Error::::NotSortedAndUnique); - let mut unapplied = ::UnappliedSlashes::get(&era); + let mut unapplied = UnappliedSlashes::::get(&era); let last_item = slash_indices[slash_indices.len() - 1]; ensure!((last_item as usize) < unapplied.len(), Error::::InvalidSlashIndex); @@ -1461,7 +1460,7 @@ pub mod pallet { unapplied.remove(index); } - ::UnappliedSlashes::insert(&era, &unapplied); + UnappliedSlashes::::insert(&era, &unapplied); Ok(()) } diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs index f73e3a6f818a2..f93375f4924e1 100644 --- a/frame/staking/src/slashing.rs +++ b/frame/staking/src/slashing.rs @@ -51,7 +51,7 @@ use crate::{ BalanceOf, Config, Error, Exposure, NegativeImbalanceOf, Pallet, Perbill, SessionInterface, - Store, UnappliedSlash, + SpanSlash, OffendingValidators, NominatorSlashInEra, UnappliedSlash, ValidatorSlashInEra, }; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ @@ -240,13 +240,13 @@ pub(crate) fn compute_slash( } let prior_slash_p = - as Store>::ValidatorSlashInEra::get(¶ms.slash_era, params.stash) + ValidatorSlashInEra::::get(¶ms.slash_era, params.stash) .map_or(Zero::zero(), |(prior_slash_proportion, _)| prior_slash_proportion); // compare slash proportions rather than slash values to avoid issues due to rounding // error. if params.slash.deconstruct() > prior_slash_p.deconstruct() { - as Store>::ValidatorSlashInEra::insert( + ValidatorSlashInEra::::insert( ¶ms.slash_era, params.stash, &(params.slash, own_slash), @@ -327,7 +327,7 @@ fn kick_out_if_recent(params: SlashParams) { /// If after adding the validator `OffendingValidatorsThreshold` is reached /// a new era will be forced. fn add_offending_validator(stash: &T::AccountId, disable: bool) { - as Store>::OffendingValidators::mutate(|offending| { + OffendingValidators::::mutate(|offending| { let validators = T::SessionInterface::validators(); let validator_index = match validators.iter().position(|i| i == stash) { Some(index) => index, @@ -388,10 +388,10 @@ fn slash_nominators( let own_slash_difference = own_slash_by_validator.saturating_sub(own_slash_prior); let mut era_slash = - as Store>::NominatorSlashInEra::get(¶ms.slash_era, stash) + NominatorSlashInEra::::get(¶ms.slash_era, stash) .unwrap_or_else(Zero::zero); era_slash += own_slash_difference; - as Store>::NominatorSlashInEra::insert(¶ms.slash_era, stash, &era_slash); + NominatorSlashInEra::::insert(¶ms.slash_era, stash, &era_slash); era_slash }; @@ -445,9 +445,9 @@ fn fetch_spans<'a, T: Config + 'a>( slash_of: &'a mut BalanceOf, reward_proportion: Perbill, ) -> InspectingSpans<'a, T> { - let spans = as Store>::SlashingSpans::get(stash).unwrap_or_else(|| { + let spans = crate::SlashingSpans::::get(stash).unwrap_or_else(|| { let spans = SlashingSpans::new(window_start); - as Store>::SlashingSpans::insert(stash, &spans); + crate::SlashingSpans::::insert(stash, &spans); spans }); @@ -496,7 +496,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> { ) -> Option { let target_span = self.era_span(slash_era)?; let span_slash_key = (self.stash.clone(), target_span.index); - let mut span_record = as Store>::SpanSlash::get(&span_slash_key); + let mut span_record = SpanSlash::::get(&span_slash_key); let mut changed = false; let reward = if span_record.slashed < slash { @@ -527,7 +527,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> { if changed { self.dirty = true; - as Store>::SpanSlash::insert(&span_slash_key, &span_record); + SpanSlash::::insert(&span_slash_key, &span_record); } Some(target_span.index) @@ -543,20 +543,20 @@ impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> { if let Some((start, end)) = self.spans.prune(self.window_start) { for span_index in start..end { - as Store>::SpanSlash::remove(&(self.stash.clone(), span_index)); + SpanSlash::::remove(&(self.stash.clone(), span_index)); } } - as Store>::SlashingSpans::insert(self.stash, &self.spans); + crate::SlashingSpans::::insert(self.stash, &self.spans); } } /// Clear slashing metadata for an obsolete era. pub(crate) fn clear_era_metadata(obsolete_era: EraIndex) { #[allow(deprecated)] - as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era, None); + ValidatorSlashInEra::::remove_prefix(&obsolete_era, None); #[allow(deprecated)] - as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era, None); + NominatorSlashInEra::::remove_prefix(&obsolete_era, None); } /// Clear slashing metadata for a dead account. @@ -564,7 +564,7 @@ pub(crate) fn clear_stash_metadata( stash: &T::AccountId, num_slashing_spans: u32, ) -> DispatchResult { - let spans = match as Store>::SlashingSpans::get(stash) { + let spans = match crate::SlashingSpans::::get(stash) { None => return Ok(()), Some(s) => s, }; @@ -574,7 +574,7 @@ pub(crate) fn clear_stash_metadata( Error::::IncorrectSlashingSpans ); - as Store>::SlashingSpans::remove(stash); + crate::SlashingSpans::::remove(stash); // kill slashing-span metadata for account. // @@ -582,7 +582,7 @@ pub(crate) fn clear_stash_metadata( // in that case, they may re-bond, but it would count again as span 0. Further ancient // slashes would slash into this new bond, since metadata has now been cleared. for span in spans.iter() { - as Store>::SpanSlash::remove(&(stash.clone(), span.index)); + SpanSlash::::remove(&(stash.clone(), span.index)); } Ok(()) diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs index 16bafae01e3c3..966eae8c1da9a 100644 --- a/frame/staking/src/tests.rs +++ b/frame/staking/src/tests.rs @@ -512,10 +512,10 @@ fn no_candidate_emergency_condition() { // initial validators assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]); let prefs = ValidatorPrefs { commission: Perbill::one(), ..Default::default() }; - ::Validators::insert(11, prefs.clone()); + Validators::::insert(11, prefs.clone()); // set the minimum validator count. - ::MinimumValidatorCount::put(10); + MinimumValidatorCount::::put(10); // try to chill let res = Staking::chill(RuntimeOrigin::signed(10)); @@ -536,7 +536,7 @@ fn no_candidate_emergency_condition() { // changed) assert_eq_uvec!(validator_controllers(), vec![10, 20, 30, 40]); // The chill is still pending. - assert!(!::Validators::contains_key(11)); + assert!(!Validators::::contains_key(11)); // No new era is created. assert_eq!(current_era, CurrentEra::::get()); }); @@ -2432,7 +2432,7 @@ fn slash_in_old_span_does_not_deselect() { ); // the validator doesn't get chilled again - assert!(::Validators::iter().any(|(stash, _)| stash == 11)); + assert!(Validators::::iter().any(|(stash, _)| stash == 11)); // but we are still forcing a new era assert_eq!(Staking::force_era(), Forcing::ForceNew); @@ -2449,7 +2449,7 @@ fn slash_in_old_span_does_not_deselect() { ); // the validator doesn't get chilled again - assert!(::Validators::iter().any(|(stash, _)| stash == 11)); + assert!(Validators::::iter().any(|(stash, _)| stash == 11)); // but it's disabled assert!(is_disabled(10)); @@ -2648,8 +2648,8 @@ fn garbage_collection_after_slashing() { ); assert_eq!(Balances::free_balance(11), 2000 - 200); - assert!(::SlashingSpans::get(&11).is_some()); - assert_eq!(::SpanSlash::get(&(11, 0)).amount(), &200); + assert!(SlashingSpans::::get(&11).is_some()); + assert_eq!(SpanSlash::::get(&(11, 0)).amount(), &200); on_offence_now( &[OffenceDetails { @@ -2665,7 +2665,7 @@ fn garbage_collection_after_slashing() { assert_eq!(Balances::free_balance(11), 2); assert_eq!(Balances::total_balance(&11), 2); - let slashing_spans = ::SlashingSpans::get(&11).unwrap(); + let slashing_spans = SlashingSpans::::get(&11).unwrap(); assert_eq!(slashing_spans.iter().count(), 2); // reap_stash respects num_slashing_spans so that weight is accurate @@ -2675,8 +2675,8 @@ fn garbage_collection_after_slashing() { ); assert_ok!(Staking::reap_stash(RuntimeOrigin::signed(20), 11, 2)); - assert!(::SlashingSpans::get(&11).is_none()); - assert_eq!(::SpanSlash::get(&(11, 0)).amount(), &0); + assert!(SlashingSpans::::get(&11).is_none()); + assert_eq!(SpanSlash::::get(&(11, 0)).amount(), &0); }) } @@ -2702,19 +2702,19 @@ fn garbage_collection_on_window_pruning() { assert_eq!(Balances::free_balance(11), 900); assert_eq!(Balances::free_balance(101), 2000 - (nominated_value / 10)); - assert!(::ValidatorSlashInEra::get(&now, &11).is_some()); - assert!(::NominatorSlashInEra::get(&now, &101).is_some()); + assert!(ValidatorSlashInEra::::get(&now, &11).is_some()); + assert!(NominatorSlashInEra::::get(&now, &101).is_some()); // + 1 because we have to exit the bonding window. for era in (0..(BondingDuration::get() + 1)).map(|offset| offset + now + 1) { - assert!(::ValidatorSlashInEra::get(&now, &11).is_some()); - assert!(::NominatorSlashInEra::get(&now, &101).is_some()); + assert!(ValidatorSlashInEra::::get(&now, &11).is_some()); + assert!(NominatorSlashInEra::::get(&now, &101).is_some()); mock::start_active_era(era); } - assert!(::ValidatorSlashInEra::get(&now, &11).is_none()); - assert!(::NominatorSlashInEra::get(&now, &101).is_none()); + assert!(ValidatorSlashInEra::::get(&now, &11).is_none()); + assert!(NominatorSlashInEra::::get(&now, &101).is_none()); }) } @@ -2755,7 +2755,7 @@ fn slashing_nominators_by_span_max() { slashing::SlashingSpan { index: 0, start: 0, length: Some(4) }, ]; - let get_span = |account| ::SlashingSpans::get(&account).unwrap(); + let get_span = |account| SlashingSpans::::get(&account).unwrap(); assert_eq!(get_span(11).iter().collect::>(), expected_spans); @@ -2817,7 +2817,7 @@ fn slashes_are_summed_across_spans() { assert_eq!(Balances::free_balance(21), 2000); assert_eq!(Staking::slashable_balance_of(&21), 1000); - let get_span = |account| ::SlashingSpans::get(&account).unwrap(); + let get_span = |account| SlashingSpans::::get(&account).unwrap(); on_offence_now( &[OffenceDetails { @@ -3192,7 +3192,7 @@ fn remove_multi_deferred() { &[Perbill::from_percent(25)], ); - assert_eq!(::UnappliedSlashes::get(&4).len(), 5); + assert_eq!(UnappliedSlashes::::get(&4).len(), 5); // fails if list is not sorted assert_noop!( @@ -3212,7 +3212,7 @@ fn remove_multi_deferred() { assert_ok!(Staking::cancel_deferred_slash(RuntimeOrigin::root(), 4, vec![0, 2, 4])); - let slashes = ::UnappliedSlashes::get(&4); + let slashes = UnappliedSlashes::::get(&4); assert_eq!(slashes.len(), 2); assert_eq!(slashes[0].validator, 21); assert_eq!(slashes[1].validator, 42); @@ -3267,7 +3267,7 @@ fn slash_kicks_validators_not_nominators_and_disables_nominator_for_kicked_valid assert_eq!(Balances::free_balance(101), 2000 - nominator_slash_amount_11); // check that validator was chilled. - assert!(::Validators::iter().all(|(stash, _)| stash != 11)); + assert!(Validators::::iter().all(|(stash, _)| stash != 11)); // actually re-bond the slashed validator assert_ok!(Staking::validate(RuntimeOrigin::signed(10), Default::default())); @@ -3612,7 +3612,7 @@ fn zero_slash_keeps_nominators() { assert_eq!(Balances::free_balance(101), 2000); // 11 is still removed.. - assert!(::Validators::iter().all(|(stash, _)| stash != 11)); + assert!(Validators::::iter().all(|(stash, _)| stash != 11)); // but their nominations are kept. assert_eq!(Staking::nominators(101).unwrap().targets, vec![11, 21]); }); From 133705909c17f1863d7c4272e78c1806e9dd285e Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:10:46 +0530 Subject: [PATCH 02/67] Remove use of trait Store from bounties pallet --- frame/bounties/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs index 325347502a918..e7a3e2053c065 100644 --- a/frame/bounties/src/lib.rs +++ b/frame/bounties/src/lib.rs @@ -188,7 +188,6 @@ pub mod pallet { use super::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From b46648a8741248aed7bd835dfe4d3686392e07c5 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:12:24 +0530 Subject: [PATCH 03/67] Remove use of trait Store from collective pallet --- frame/collective/src/lib.rs | 1 - frame/collective/src/tests.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/collective/src/lib.rs b/frame/collective/src/lib.rs index ae5b22559d7c8..c58965d2c9199 100644 --- a/frame/collective/src/lib.rs +++ b/frame/collective/src/lib.rs @@ -175,7 +175,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(PhantomData<(T, I)>); diff --git a/frame/collective/src/tests.rs b/frame/collective/src/tests.rs index 2d9b31a539d59..79f6cc27fadbd 100644 --- a/frame/collective/src/tests.rs +++ b/frame/collective/src/tests.rs @@ -57,7 +57,6 @@ mod mock_democracy { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From d9086f988b6afd697a7b5961861aff29bb472145 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:15:45 +0530 Subject: [PATCH 04/67] Remove use of trait Store from babe pallet --- frame/babe/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs index bb07037ee0a12..d72e9cae1300e 100644 --- a/frame/babe/src/lib.rs +++ b/frame/babe/src/lib.rs @@ -118,7 +118,6 @@ pub mod pallet { /// The BABE Pallet #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 4017a4bfb9e549f055b544c78501501f6ac783b9 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:17:39 +0530 Subject: [PATCH 05/67] Remove use of trait Store from assets pallet --- frame/assets/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/assets/src/lib.rs b/frame/assets/src/lib.rs index 662c20e00fb1a..bb0e8ce8b3704 100644 --- a/frame/assets/src/lib.rs +++ b/frame/assets/src/lib.rs @@ -197,7 +197,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From d2df7ae6480f17b5469277f5d7e3532aef4ff0c5 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:19:13 +0530 Subject: [PATCH 06/67] Remove use of trait Store from grandpa pallet --- frame/grandpa/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs index 85d116ee7d7e7..c6c16447428fd 100644 --- a/frame/grandpa/src/lib.rs +++ b/frame/grandpa/src/lib.rs @@ -80,7 +80,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From 16cd888f64be9a115666ab43c133dd3d12d66b94 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:20:32 +0530 Subject: [PATCH 07/67] Remove use of trait Store from balances pallet --- frame/balances/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs index f02c7f9c0c579..ecd7e171e39ec 100644 --- a/frame/balances/src/lib.rs +++ b/frame/balances/src/lib.rs @@ -253,7 +253,6 @@ pub mod pallet { frame_support::traits::StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(PhantomData<(T, I)>); From bd9473f2d5a4febe0e318a1f7edaac5507de3967 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:21:43 +0530 Subject: [PATCH 08/67] Remove use of trait Store from authorship pallet --- frame/authorship/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/authorship/src/lib.rs b/frame/authorship/src/lib.rs index cb1d777fa56c3..4bb8ba587ac8b 100644 --- a/frame/authorship/src/lib.rs +++ b/frame/authorship/src/lib.rs @@ -49,7 +49,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::hooks] From 21660ad8a0ff9ed7267eeab77cb681f1f16bf058 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:23:20 +0530 Subject: [PATCH 09/67] Remove use of trait Store from authority-discovery pallet --- frame/authority-discovery/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/authority-discovery/src/lib.rs b/frame/authority-discovery/src/lib.rs index e93deabeb5318..341646b674e48 100644 --- a/frame/authority-discovery/src/lib.rs +++ b/frame/authority-discovery/src/lib.rs @@ -38,7 +38,6 @@ pub mod pallet { use frame_support::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 9c2673b47c0abf2602d673d5c0787b2bf6c51c1c Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:24:18 +0530 Subject: [PATCH 10/67] Remove use of trait Store from atomic-swap pallet --- frame/atomic-swap/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/atomic-swap/src/lib.rs b/frame/atomic-swap/src/lib.rs index 68d2544204b83..ed89a88698a3c 100644 --- a/frame/atomic-swap/src/lib.rs +++ b/frame/atomic-swap/src/lib.rs @@ -184,7 +184,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::storage] From 91c2014eab7c53d86c9aa71f0252339db853aa3a Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:26:15 +0530 Subject: [PATCH 11/67] Remove use of trait Store from sudo pallet --- frame/sudo/src/lib.rs | 1 - frame/sudo/src/mock.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/sudo/src/lib.rs b/frame/sudo/src/lib.rs index 4d5149926ac29..47309833a0681 100644 --- a/frame/sudo/src/lib.rs +++ b/frame/sudo/src/lib.rs @@ -133,7 +133,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::call] diff --git a/frame/sudo/src/mock.rs b/frame/sudo/src/mock.rs index 59a5cb6cc1a15..6d6043cfd1821 100644 --- a/frame/sudo/src/mock.rs +++ b/frame/sudo/src/mock.rs @@ -39,7 +39,6 @@ pub mod logger { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::call] From 0ce416a8870dbb6eb6c9ba678a9f9d64abadd009 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:27:26 +0530 Subject: [PATCH 12/67] Remove use of trait Store from scheduler pallet --- frame/scheduler/src/lib.rs | 1 - frame/scheduler/src/mock.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/scheduler/src/lib.rs b/frame/scheduler/src/lib.rs index 95bfe8411f381..09bb3561188f8 100644 --- a/frame/scheduler/src/lib.rs +++ b/frame/scheduler/src/lib.rs @@ -172,7 +172,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); diff --git a/frame/scheduler/src/mock.rs b/frame/scheduler/src/mock.rs index 914a97ab9d5d7..adb54fd78b181 100644 --- a/frame/scheduler/src/mock.rs +++ b/frame/scheduler/src/mock.rs @@ -50,7 +50,6 @@ pub mod logger { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::hooks] From 3a91cfeb22e7f4db3a501681f0e3040a3bdcfb65 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:28:16 +0530 Subject: [PATCH 13/67] Remove use of trait Store from scored-pool pallet --- frame/scored-pool/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/scored-pool/src/lib.rs b/frame/scored-pool/src/lib.rs index 16d59b6609000..336a69a798477 100644 --- a/frame/scored-pool/src/lib.rs +++ b/frame/scored-pool/src/lib.rs @@ -135,7 +135,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 26f65e52407180f94e76409b5cfb9537ef630621 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:29:27 +0530 Subject: [PATCH 14/67] Remove use of trait Store from society pallet --- frame/society/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/society/src/lib.rs b/frame/society/src/lib.rs index f3207dabdaf8f..899b6005af024 100644 --- a/frame/society/src/lib.rs +++ b/frame/society/src/lib.rs @@ -371,7 +371,6 @@ pub mod pallet { use super::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); From e32ec20988cf1c3bddff846ffa8732889c1108fe Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:31:58 +0530 Subject: [PATCH 15/67] Remove use of trait Store from lottery pallet --- frame/lottery/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/lottery/src/lib.rs b/frame/lottery/src/lib.rs index bd7ca40fb4556..178f221a8946f 100644 --- a/frame/lottery/src/lib.rs +++ b/frame/lottery/src/lib.rs @@ -123,7 +123,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// The pallet's config trait. From 9288d53d6e9b27540759afac20ef3cc63ad61c69 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:33:00 +0530 Subject: [PATCH 16/67] Remove use of trait Store from executive pallet --- frame/executive/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs index 05f3ee4f53588..4c534efae12aa 100644 --- a/frame/executive/src/lib.rs +++ b/frame/executive/src/lib.rs @@ -706,7 +706,6 @@ mod tests { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 236d62e577ac3201e1d489b0a451815090eb5d23 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:33:54 +0530 Subject: [PATCH 17/67] Remove use of trait Store from democracy pallet --- frame/democracy/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/democracy/src/lib.rs b/frame/democracy/src/lib.rs index e1e111e96313f..a3d7f103a98f3 100644 --- a/frame/democracy/src/lib.rs +++ b/frame/democracy/src/lib.rs @@ -217,7 +217,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From 3fa3fc2cb4f36a9a8b947cc64b05fa288b922e8d Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:35:16 +0530 Subject: [PATCH 18/67] Remove use of trait Store from elections-phragmen pallet --- frame/elections-phragmen/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/elections-phragmen/src/lib.rs b/frame/elections-phragmen/src/lib.rs index fa63762c5e09a..e3eed6ec4bcc4 100644 --- a/frame/elections-phragmen/src/lib.rs +++ b/frame/elections-phragmen/src/lib.rs @@ -187,7 +187,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(PhantomData); From 19a092c360bba6c5ad63e08bb827e90775f2aad5 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:36:14 +0530 Subject: [PATCH 19/67] Remove use of trait Store from indices pallet --- frame/indices/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/indices/src/lib.rs b/frame/indices/src/lib.rs index 82dc48f7bce5b..74f86abb51914 100644 --- a/frame/indices/src/lib.rs +++ b/frame/indices/src/lib.rs @@ -75,7 +75,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::call] From a52c4bc684d5d198d5d102412139864980752c58 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:37:03 +0530 Subject: [PATCH 20/67] Remove use of trait Store from identity pallet --- frame/identity/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/identity/src/lib.rs b/frame/identity/src/lib.rs index d1b764591dc79..f192ee2b461b3 100644 --- a/frame/identity/src/lib.rs +++ b/frame/identity/src/lib.rs @@ -152,7 +152,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// Information that is pertinent to identify the entity behind an account. From cfe170a4d0ea263b8914dd83311508e6f4ed152c Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:37:54 +0530 Subject: [PATCH 21/67] Remove use of trait Store from multisig pallet --- frame/multisig/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/multisig/src/lib.rs b/frame/multisig/src/lib.rs index fb10838cedc44..64058be9c8fbf 100644 --- a/frame/multisig/src/lib.rs +++ b/frame/multisig/src/lib.rs @@ -172,7 +172,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From 159a49225fb8fb105d7ed4f930f3d4f115a5e321 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:38:48 +0530 Subject: [PATCH 22/67] Remove use of trait Store from merkle-mountain-range pallet --- frame/merkle-mountain-range/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/merkle-mountain-range/src/lib.rs b/frame/merkle-mountain-range/src/lib.rs index 0b4c2f8d97a8b..4ef833e6c5fca 100644 --- a/frame/merkle-mountain-range/src/lib.rs +++ b/frame/merkle-mountain-range/src/lib.rs @@ -121,7 +121,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); /// This pallet's configuration trait From 546af25c5866bf96c1d662e9e8197bc01c09d059 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:39:59 +0530 Subject: [PATCH 23/67] Remove use of trait Store from im-online pallet --- frame/im-online/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/im-online/src/lib.rs b/frame/im-online/src/lib.rs index 39762945ca70e..bc1e541cef125 100644 --- a/frame/im-online/src/lib.rs +++ b/frame/im-online/src/lib.rs @@ -313,7 +313,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 39fbf2b35d752b2e8d71a9a998dba3d400675390 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:40:41 +0530 Subject: [PATCH 24/67] Remove use of trait Store from membership pallet --- frame/membership/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/membership/src/lib.rs b/frame/membership/src/lib.rs index 04263b93e1a89..0be33a95613fe 100644 --- a/frame/membership/src/lib.rs +++ b/frame/membership/src/lib.rs @@ -50,7 +50,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(PhantomData<(T, I)>); From 5830e239cb405f66722b5d213cd5bb1fd98fc31a Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:41:28 +0530 Subject: [PATCH 25/67] Remove use of trait Store from nicks pallet --- frame/nicks/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/nicks/src/lib.rs b/frame/nicks/src/lib.rs index b457cc2996dbf..b74d2e6ee40b2 100644 --- a/frame/nicks/src/lib.rs +++ b/frame/nicks/src/lib.rs @@ -114,7 +114,6 @@ pub mod pallet { StorageMap<_, Twox64Concat, T::AccountId, (BoundedVec, BalanceOf)>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::call] From 5798277ac9bf87f2208a4ca4a117951ae6a61e48 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:46:18 +0530 Subject: [PATCH 26/67] Remove use of trait Store from session pallet --- frame/session/src/historical/mod.rs | 5 ++--- frame/session/src/lib.rs | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frame/session/src/historical/mod.rs b/frame/session/src/historical/mod.rs index d9827679400b8..f00a1c95e763e 100644 --- a/frame/session/src/historical/mod.rs +++ b/frame/session/src/historical/mod.rs @@ -62,7 +62,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); @@ -97,7 +96,7 @@ impl Pallet { /// Prune historical stored session roots up to (but not including) /// `up_to`. pub fn prune_up_to(up_to: SessionIndex) { - ::StoredRange::mutate(|range| { + StoredRange::::mutate(|range| { let (start, end) = match *range { Some(range) => range, None => return, // nothing to prune. @@ -109,7 +108,7 @@ impl Pallet { return // out of bounds. harmless. } - (start..up_to).for_each(::HistoricalSessions::remove); + (start..up_to).for_each(HistoricalSessions::::remove); let new_start = up_to; *range = if new_start == end { diff --git a/frame/session/src/lib.rs b/frame/session/src/lib.rs index 7d5dd632493f3..ed5f80e6099c1 100644 --- a/frame/session/src/lib.rs +++ b/frame/session/src/lib.rs @@ -371,7 +371,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(0); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(_); From f14a4bd436841cc46ebc87eb79ad6be6ca94cff2 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:48:18 +0530 Subject: [PATCH 27/67] Remove use of trait Store from transaction-payment pallet --- frame/transaction-payment/asset-tx-payment/src/lib.rs | 1 - frame/transaction-payment/src/lib.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/transaction-payment/asset-tx-payment/src/lib.rs b/frame/transaction-payment/asset-tx-payment/src/lib.rs index ec0bfcd4f4028..b9cd6ef995578 100644 --- a/frame/transaction-payment/asset-tx-payment/src/lib.rs +++ b/frame/transaction-payment/asset-tx-payment/src/lib.rs @@ -124,7 +124,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::event] diff --git a/frame/transaction-payment/src/lib.rs b/frame/transaction-payment/src/lib.rs index 42798c62f4012..83ff69428d144 100644 --- a/frame/transaction-payment/src/lib.rs +++ b/frame/transaction-payment/src/lib.rs @@ -295,7 +295,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From aa1a692dce5ee0dc0eb0fa35736dd57289c5fc7a Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:52:31 +0530 Subject: [PATCH 28/67] Remove use of trait Store from utility pallet --- frame/utility/src/lib.rs | 1 - frame/utility/src/tests.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/utility/src/lib.rs b/frame/utility/src/lib.rs index 6cfa8b7e36e9a..af212a31eb971 100644 --- a/frame/utility/src/lib.rs +++ b/frame/utility/src/lib.rs @@ -76,7 +76,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// Configuration trait. diff --git a/frame/utility/src/tests.rs b/frame/utility/src/tests.rs index 413315a25eb44..d9ac2ebbc15a9 100644 --- a/frame/utility/src/tests.rs +++ b/frame/utility/src/tests.rs @@ -96,7 +96,6 @@ mod mock_democracy { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 48c31de6dfeac3437b3df3d158d72b9c81621179 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:53:11 +0530 Subject: [PATCH 29/67] Remove use of trait Store from child-bounties pallet --- frame/child-bounties/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/child-bounties/src/lib.rs b/frame/child-bounties/src/lib.rs index 3046d97007cae..094b41822c433 100644 --- a/frame/child-bounties/src/lib.rs +++ b/frame/child-bounties/src/lib.rs @@ -130,7 +130,6 @@ pub mod pallet { use super::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 99599e972cc857b0d6a07748788bd14d1ece29b6 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:54:18 +0530 Subject: [PATCH 30/67] Remove use of trait Store from nis pallet --- frame/nis/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/nis/src/lib.rs b/frame/nis/src/lib.rs index 9cae5e2aae5c1..6fd9c60a89836 100644 --- a/frame/nis/src/lib.rs +++ b/frame/nis/src/lib.rs @@ -310,7 +310,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// A single bid, an item of a *queue* in `Queues`. From 81eda703af00a841c3041780990fb0ad694c26e2 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:55:28 +0530 Subject: [PATCH 31/67] Remove use of trait Store from nfts pallet --- frame/nfts/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/nfts/src/lib.rs b/frame/nfts/src/lib.rs index 681d908423da6..3fa7e88666afd 100644 --- a/frame/nfts/src/lib.rs +++ b/frame/nfts/src/lib.rs @@ -70,7 +70,6 @@ pub mod pallet { use sp_runtime::traits::{IdentifyAccount, Verify}; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[cfg(feature = "runtime-benchmarks")] From 7f4e38fbea4c8255b4897d1557f63f6b99baed66 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 15:57:08 +0530 Subject: [PATCH 32/67] Remove use of trait Store from conviction-voting pallet --- frame/conviction-voting/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/conviction-voting/src/lib.rs b/frame/conviction-voting/src/lib.rs index 6c15c6cf25b13..f28953c4a35b9 100644 --- a/frame/conviction-voting/src/lib.rs +++ b/frame/conviction-voting/src/lib.rs @@ -92,7 +92,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] From 622725b62e93d3d4fbd63e4d31a80204dd1a2c04 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:22:30 +0530 Subject: [PATCH 33/67] Remove use of trait Store from treasury pallet --- frame/treasury/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs index 04e989373c8cd..450aee51f2ce8 100644 --- a/frame/treasury/src/lib.rs +++ b/frame/treasury/src/lib.rs @@ -140,7 +140,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::config] From bb503a032a22e6da7c49a4d025bd2db3e6f714e6 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:24:27 +0530 Subject: [PATCH 34/67] Remove use of trait Store from vesting pallet --- frame/vesting/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/vesting/src/lib.rs b/frame/vesting/src/lib.rs index dbc018796a3c6..af3654924914c 100644 --- a/frame/vesting/src/lib.rs +++ b/frame/vesting/src/lib.rs @@ -211,7 +211,6 @@ pub mod pallet { pub(crate) type StorageVersion = StorageValue<_, Releases, ValueQuery>; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::genesis_config] From db046e420f7f44768921b762c3385bb38695bdd0 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:25:17 +0530 Subject: [PATCH 35/67] Remove use of trait Store from preimage pallet --- frame/preimage/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/preimage/src/lib.rs b/frame/preimage/src/lib.rs index 74a3176b1144a..60208424db953 100644 --- a/frame/preimage/src/lib.rs +++ b/frame/preimage/src/lib.rs @@ -107,7 +107,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(PhantomData); From ee461d801be14eaea9d626e76b2c17fce268ac3d Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:26:28 +0530 Subject: [PATCH 36/67] Remove use of trait Store from uniques pallet --- frame/uniques/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/uniques/src/lib.rs b/frame/uniques/src/lib.rs index 587f1ae4b7d84..fd94bd3a9a7e4 100644 --- a/frame/uniques/src/lib.rs +++ b/frame/uniques/src/lib.rs @@ -71,7 +71,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[cfg(feature = "runtime-benchmarks")] From a583a205b0df80acd777929ab3e77d8487ea8ca4 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:27:18 +0530 Subject: [PATCH 37/67] Remove use of trait Store from ranked-collective pallet --- frame/ranked-collective/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/ranked-collective/src/lib.rs b/frame/ranked-collective/src/lib.rs index 8ed1bbd2e01d6..288fd78d6e718 100644 --- a/frame/ranked-collective/src/lib.rs +++ b/frame/ranked-collective/src/lib.rs @@ -321,7 +321,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::config] From 95312e9e9d60d9eaad9bdec5a3f8b68accefd527 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:28:28 +0530 Subject: [PATCH 38/67] Remove use of trait Store from beefy-mmr pallet --- frame/beefy-mmr/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/beefy-mmr/src/lib.rs b/frame/beefy-mmr/src/lib.rs index ba52be4f883f0..b9d4bdfd8eb59 100644 --- a/frame/beefy-mmr/src/lib.rs +++ b/frame/beefy-mmr/src/lib.rs @@ -95,7 +95,6 @@ pub mod pallet { /// BEEFY-MMR pallet. #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// The module's configuration trait. From 056c344eab38e6576008426e93d00ca182cd82d0 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:29:32 +0530 Subject: [PATCH 39/67] Remove use of trait Store from referenda pallet --- frame/referenda/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/referenda/src/lib.rs b/frame/referenda/src/lib.rs index dccc40112867d..f699850062267 100644 --- a/frame/referenda/src/lib.rs +++ b/frame/referenda/src/lib.rs @@ -145,7 +145,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From 2e754a92727a0d555204f57437f0826149e14307 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:30:15 +0530 Subject: [PATCH 40/67] Remove use of trait Store from whitelist pallet --- frame/whitelist/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/whitelist/src/lib.rs b/frame/whitelist/src/lib.rs index bfbadd073a8f8..decf010b06757 100644 --- a/frame/whitelist/src/lib.rs +++ b/frame/whitelist/src/lib.rs @@ -88,7 +88,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::event] From 5b14f52346ea346d6b315c27f2263d1833532b69 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:31:10 +0530 Subject: [PATCH 41/67] Remove use of trait Store from alliance pallet --- frame/alliance/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/alliance/src/lib.rs b/frame/alliance/src/lib.rs index c9232a1f2fb8e..6cc162f7d2f3d 100644 --- a/frame/alliance/src/lib.rs +++ b/frame/alliance/src/lib.rs @@ -222,7 +222,6 @@ pub mod pallet { use super::*; #[pallet::pallet] - #[pallet::generate_store(pub (super) trait Store)] #[pallet::storage_version(migration::STORAGE_VERSION)] pub struct Pallet(PhantomData<(T, I)>); From cdd33e8f83d1b1997ea1496a79526375d5e3c08f Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:32:51 +0530 Subject: [PATCH 42/67] Remove use of trait Store from nomination-pools pallet --- frame/nomination-pools/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/nomination-pools/src/lib.rs b/frame/nomination-pools/src/lib.rs index b296eb048562a..c1dda69ab5d67 100644 --- a/frame/nomination-pools/src/lib.rs +++ b/frame/nomination-pools/src/lib.rs @@ -1214,7 +1214,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(3); #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); From c047b40a061a59601833da543b6563129bdefb4a Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:34:05 +0530 Subject: [PATCH 43/67] Remove use of trait Store from state-trie-migration pallet --- frame/state-trie-migration/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/state-trie-migration/src/lib.rs b/frame/state-trie-migration/src/lib.rs index 547dfa5cda9c8..5385c6b5f4f46 100644 --- a/frame/state-trie-migration/src/lib.rs +++ b/frame/state-trie-migration/src/lib.rs @@ -439,7 +439,6 @@ pub mod pallet { /// The outer Pallet struct. #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] pub struct Pallet(_); /// Configurations of this pallet. From 18bdc65425780d2ac28b9b159d562fb3ef8608c4 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:36:03 +0530 Subject: [PATCH 44/67] Remove use of trait Store from message-queue pallet --- frame/message-queue/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frame/message-queue/src/lib.rs b/frame/message-queue/src/lib.rs index 6c264be3c834e..d00fe9c9eb318 100644 --- a/frame/message-queue/src/lib.rs +++ b/frame/message-queue/src/lib.rs @@ -39,7 +39,7 @@ //! which queue it will be stored. Messages are stored by being appended to the last [`Page`] of a //! book. Each book keeps track of its pages by indexing `Pages`. The `ReadyRing` contains all //! queues which hold at least one unprocessed message and are thereby *ready* to be serviced. The -//! `ServiceHead` indicates which *ready* queue is the next to be serviced. +//! `ServiceHead` indicates which *ready* queue is the next to be serviced. //! The pallet implements [`frame_support::traits::EnqueueMessage`], //! [`frame_support::traits::ServiceQueues`] and has [`frame_support::traits::ProcessMessage`] and //! [`OnQueueChanged`] hooks to communicate with the outside world. @@ -438,7 +438,6 @@ pub mod pallet { use super::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// The module configuration trait. From fd88b0949f847091b112c828c9412c0fd3a12bc9 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:37:24 +0530 Subject: [PATCH 45/67] Remove use of trait Store from root-offences pallet --- frame/root-offences/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/root-offences/src/lib.rs b/frame/root-offences/src/lib.rs index 92f3e17b5e17e..a93e7ff848718 100644 --- a/frame/root-offences/src/lib.rs +++ b/frame/root-offences/src/lib.rs @@ -57,7 +57,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::event] From f29edf595defca8bd6014778849dc7d59d407c68 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:38:03 +0530 Subject: [PATCH 46/67] Remove use of trait Store from root-testing pallet --- frame/root-testing/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/root-testing/src/lib.rs b/frame/root-testing/src/lib.rs index ad0e4cfea7373..e04c7bfa13d26 100644 --- a/frame/root-testing/src/lib.rs +++ b/frame/root-testing/src/lib.rs @@ -39,7 +39,6 @@ pub mod pallet { pub trait Config: frame_system::Config {} #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::call] From 0e55d982f3a2e1c9e3c9ecdd08cf8ce545e207db Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 16:38:56 +0530 Subject: [PATCH 47/67] Remove use of trait Store from timestamps pallet --- frame/examples/basic/src/lib.rs | 1 - frame/examples/offchain-worker/src/lib.rs | 1 - frame/insecure-randomness-collective-flip/src/lib.rs | 4 +--- frame/salary/src/lib.rs | 1 - frame/timestamp/src/lib.rs | 1 - frame/tips/src/lib.rs | 1 - frame/transaction-storage/src/lib.rs | 1 - 7 files changed, 1 insertion(+), 9 deletions(-) diff --git a/frame/examples/basic/src/lib.rs b/frame/examples/basic/src/lib.rs index a75a0e17cceba..6665c3b78b024 100644 --- a/frame/examples/basic/src/lib.rs +++ b/frame/examples/basic/src/lib.rs @@ -379,7 +379,6 @@ pub mod pallet { // Simple declaration of the `Pallet` type. It is placeholder we use to implement traits and // method. #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); // Pallet implements [`Hooks`] trait to define some logic to execute in some context. diff --git a/frame/examples/offchain-worker/src/lib.rs b/frame/examples/offchain-worker/src/lib.rs index c9c72f8e82514..418ad5d139ef3 100644 --- a/frame/examples/offchain-worker/src/lib.rs +++ b/frame/examples/offchain-worker/src/lib.rs @@ -158,7 +158,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::hooks] diff --git a/frame/insecure-randomness-collective-flip/src/lib.rs b/frame/insecure-randomness-collective-flip/src/lib.rs index c73419efe87fe..ad39c4c4fd885 100644 --- a/frame/insecure-randomness-collective-flip/src/lib.rs +++ b/frame/insecure-randomness-collective-flip/src/lib.rs @@ -17,7 +17,7 @@ //! # DO NOT USE IN PRODUCTION //! -//! The produced values do not fulfill the cryptographic requirements for random numbers. +//! The produced values do not fulfill the cryptographic requirements for random numbers. //! Should not be used for high-stake production use-cases. //! //! # Randomness Pallet @@ -51,7 +51,6 @@ //! use frame_system::pallet_prelude::*; //! //! #[pallet::pallet] -//! #[pallet::generate_store(pub(super) trait Store)] //! pub struct Pallet(_); //! //! #[pallet::config] @@ -94,7 +93,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/frame/salary/src/lib.rs b/frame/salary/src/lib.rs index 2169952f1a7f3..d0cfc5a980cf6 100644 --- a/frame/salary/src/lib.rs +++ b/frame/salary/src/lib.rs @@ -155,7 +155,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::config] diff --git a/frame/timestamp/src/lib.rs b/frame/timestamp/src/lib.rs index 93af4447d9612..192c81502bf6e 100644 --- a/frame/timestamp/src/lib.rs +++ b/frame/timestamp/src/lib.rs @@ -151,7 +151,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); /// Current time for the current block. diff --git a/frame/tips/src/lib.rs b/frame/tips/src/lib.rs index d82906563fb8e..970e2ac152c4b 100644 --- a/frame/tips/src/lib.rs +++ b/frame/tips/src/lib.rs @@ -121,7 +121,6 @@ pub mod pallet { const STORAGE_VERSION: StorageVersion = StorageVersion::new(4); #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] #[pallet::without_storage_info] pub struct Pallet(_); diff --git a/frame/transaction-storage/src/lib.rs b/frame/transaction-storage/src/lib.rs index c4b1a622fc5f3..59662ee860541 100644 --- a/frame/transaction-storage/src/lib.rs +++ b/frame/transaction-storage/src/lib.rs @@ -141,7 +141,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::hooks] From 86524c2072e34f05a2ff10de8e384c2374503db5 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:01:20 +0530 Subject: [PATCH 48/67] Remove use of trait Store from system pallet --- frame/system/benches/bench.rs | 1 - frame/system/src/lib.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/frame/system/benches/bench.rs b/frame/system/benches/bench.rs index 51652727c4766..f440e2a8eb796 100644 --- a/frame/system/benches/bench.rs +++ b/frame/system/benches/bench.rs @@ -29,7 +29,6 @@ mod module { use frame_support::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); #[pallet::config] diff --git a/frame/system/src/lib.rs b/frame/system/src/lib.rs index 5e921ab854df1..44ea07635d3e2 100644 --- a/frame/system/src/lib.rs +++ b/frame/system/src/lib.rs @@ -357,7 +357,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub (super) trait Store)] pub struct Pallet(_); #[pallet::hooks] From 2796879962696d6c418c3b3908743b5b63c16d4f Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:02:08 +0530 Subject: [PATCH 49/67] Remove use of trait Store from offences pallet --- frame/offences/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/offences/src/lib.rs b/frame/offences/src/lib.rs index 6ba16161b320c..659e578991042 100644 --- a/frame/offences/src/lib.rs +++ b/frame/offences/src/lib.rs @@ -49,7 +49,6 @@ pub mod pallet { use frame_support::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); From 6751fe186cb94b9b9fc8b0896730e172086332d5 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:02:52 +0530 Subject: [PATCH 50/67] Remove use of trait Store from recovery pallet --- frame/recovery/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/recovery/src/lib.rs b/frame/recovery/src/lib.rs index b32d19d5dda1d..d66b5725fd4f7 100644 --- a/frame/recovery/src/lib.rs +++ b/frame/recovery/src/lib.rs @@ -218,7 +218,6 @@ pub mod pallet { use sp_runtime::ArithmeticError; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// Configuration trait. From e2a0d94780e5e1639ac37ef7f812fe68d352cf94 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:03:36 +0530 Subject: [PATCH 51/67] Remove use of trait Store from node-authorization pallet --- frame/node-authorization/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/node-authorization/src/lib.rs b/frame/node-authorization/src/lib.rs index d91a769b36ba0..eaeda3cade9e9 100644 --- a/frame/node-authorization/src/lib.rs +++ b/frame/node-authorization/src/lib.rs @@ -59,7 +59,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); From a7986e6b67ce8d3fabf12c6a4ba75dcf54db18fb Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:04:54 +0530 Subject: [PATCH 52/67] Remove use of trait Store from proxy pallet --- frame/proxy/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/proxy/src/lib.rs b/frame/proxy/src/lib.rs index c26a53d1a0c40..023d0253519f7 100644 --- a/frame/proxy/src/lib.rs +++ b/frame/proxy/src/lib.rs @@ -102,7 +102,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// Configuration trait. From 03bbbd76085e5eb0218baf7ae2e86cdf78237c38 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:06:54 +0530 Subject: [PATCH 53/67] Remove use of trait Store from benchmarking pallet --- frame/benchmarking/pov/src/lib.rs | 1 - frame/benchmarking/src/tests.rs | 1 - frame/benchmarking/src/tests_instance.rs | 1 - 3 files changed, 3 deletions(-) diff --git a/frame/benchmarking/pov/src/lib.rs b/frame/benchmarking/pov/src/lib.rs index b66b5e417817a..dccfe72d3f243 100644 --- a/frame/benchmarking/pov/src/lib.rs +++ b/frame/benchmarking/pov/src/lib.rs @@ -32,7 +32,6 @@ pub mod pallet { use sp_std::prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::config] diff --git a/frame/benchmarking/src/tests.rs b/frame/benchmarking/src/tests.rs index a3e19cde3642e..453e8e125cbb3 100644 --- a/frame/benchmarking/src/tests.rs +++ b/frame/benchmarking/src/tests.rs @@ -35,7 +35,6 @@ mod pallet_test { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData); #[pallet::config] diff --git a/frame/benchmarking/src/tests_instance.rs b/frame/benchmarking/src/tests_instance.rs index 49f9786d77ea1..d49d7cc817c6b 100644 --- a/frame/benchmarking/src/tests_instance.rs +++ b/frame/benchmarking/src/tests_instance.rs @@ -34,7 +34,6 @@ mod pallet_test { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); pub trait OtherConfig { From 45ea583868843286b7694b1abb0db9b0401bda6b Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 4 Mar 2023 17:08:07 +0530 Subject: [PATCH 54/67] Remove use of trait Store from bags-list pallet --- frame/bags-list/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/bags-list/src/lib.rs b/frame/bags-list/src/lib.rs index b65b65c39223d..87eb2d1b341aa 100644 --- a/frame/bags-list/src/lib.rs +++ b/frame/bags-list/src/lib.rs @@ -99,7 +99,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] pub struct Pallet(_); #[pallet::config] From 4cdb71fc0a12f85cc142b50041157c27d89b5506 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Mon, 6 Mar 2023 20:48:29 +0530 Subject: [PATCH 55/67] Add deprecated warning in store_trait --- frame/support/procedural/src/storage/store_trait.rs | 2 ++ frame/support/src/lib.rs | 1 + frame/support/src/storage/generator/double_map.rs | 1 + frame/support/src/storage/generator/map.rs | 1 + frame/support/src/storage/generator/mod.rs | 1 + frame/support/src/storage/generator/nmap.rs | 1 + 6 files changed, 7 insertions(+) diff --git a/frame/support/procedural/src/storage/store_trait.rs b/frame/support/procedural/src/storage/store_trait.rs index 5dca502518a33..4f62543422bcf 100644 --- a/frame/support/procedural/src/storage/store_trait.rs +++ b/frame/support/procedural/src/storage/store_trait.rs @@ -45,6 +45,8 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream { let where_clause = &def.where_clause; quote!( + #[deprecated(note = r"The `Store` trait will be removed soon. Check + https://github.com/paritytech/substrate/pull/13535 for more details.")] #visibility trait #store_trait { #decl_store_items } diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs index 4e9bc32b0043b..ea558888bf69c 100644 --- a/frame/support/src/lib.rs +++ b/frame/support/src/lib.rs @@ -825,6 +825,7 @@ macro_rules! assert_error_encoded_size { pub use serde::{Deserialize, Serialize}; #[cfg(test)] +#[allow(deprecated)] pub mod tests { use super::*; use crate::metadata::{ diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs index 5763a472cd570..fe749b32d8eb7 100644 --- a/frame/support/src/storage/generator/double_map.rs +++ b/frame/support/src/storage/generator/double_map.rs @@ -511,6 +511,7 @@ where /// Test iterators for StorageDoubleMap #[cfg(test)] +#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs index fb499384f1506..59d37e35a0107 100644 --- a/frame/support/src/storage/generator/map.rs +++ b/frame/support/src/storage/generator/map.rs @@ -346,6 +346,7 @@ impl> storage::StorageMap /// Test iterators for StorageMap #[cfg(test)] +#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs index 2da612b24de8f..ce8edabee5634 100644 --- a/frame/support/src/storage/generator/mod.rs +++ b/frame/support/src/storage/generator/mod.rs @@ -36,6 +36,7 @@ pub use value::StorageValue; #[cfg(test)] #[allow(dead_code)] +#[allow(deprecated)] mod tests { use crate::{ assert_noop, assert_ok, diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs index 21fe7b41eda99..960c5d8f3dbc8 100755 --- a/frame/support/src/storage/generator/nmap.rs +++ b/frame/support/src/storage/generator/nmap.rs @@ -459,6 +459,7 @@ impl> /// Test iterators for StorageNMap #[cfg(test)] +#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, From abc4a04a5a14a19efeb9b3d61d62c03c542c26df Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Tue, 7 Mar 2023 15:28:49 +0530 Subject: [PATCH 56/67] Change warning message --- frame/support/procedural/src/storage/store_trait.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/support/procedural/src/storage/store_trait.rs b/frame/support/procedural/src/storage/store_trait.rs index 4f62543422bcf..ef703b8af76c6 100644 --- a/frame/support/procedural/src/storage/store_trait.rs +++ b/frame/support/procedural/src/storage/store_trait.rs @@ -45,8 +45,8 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream { let where_clause = &def.where_clause; quote!( - #[deprecated(note = r"The `Store` trait will be removed soon. Check - https://github.com/paritytech/substrate/pull/13535 for more details.")] + #[deprecated(note = r"Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. + Check https://github.com/paritytech/substrate/pull/13535 for more details.")] #visibility trait #store_trait { #decl_store_items } From 73c1a0d21c196ab18ea83bcd23a481d1feaa77b6 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Thu, 9 Mar 2023 08:23:43 +0530 Subject: [PATCH 57/67] Run cargo fmt --- frame/staking/src/slashing.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/frame/staking/src/slashing.rs b/frame/staking/src/slashing.rs index f93375f4924e1..bb02da73f6e5d 100644 --- a/frame/staking/src/slashing.rs +++ b/frame/staking/src/slashing.rs @@ -50,8 +50,9 @@ //! Based on research at use crate::{ - BalanceOf, Config, Error, Exposure, NegativeImbalanceOf, Pallet, Perbill, SessionInterface, - SpanSlash, OffendingValidators, NominatorSlashInEra, UnappliedSlash, ValidatorSlashInEra, + BalanceOf, Config, Error, Exposure, NegativeImbalanceOf, NominatorSlashInEra, + OffendingValidators, Pallet, Perbill, SessionInterface, SpanSlash, UnappliedSlash, + ValidatorSlashInEra, }; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ @@ -239,9 +240,8 @@ pub(crate) fn compute_slash( return None } - let prior_slash_p = - ValidatorSlashInEra::::get(¶ms.slash_era, params.stash) - .map_or(Zero::zero(), |(prior_slash_proportion, _)| prior_slash_proportion); + let prior_slash_p = ValidatorSlashInEra::::get(¶ms.slash_era, params.stash) + .map_or(Zero::zero(), |(prior_slash_proportion, _)| prior_slash_proportion); // compare slash proportions rather than slash values to avoid issues due to rounding // error. @@ -388,8 +388,7 @@ fn slash_nominators( let own_slash_difference = own_slash_by_validator.saturating_sub(own_slash_prior); let mut era_slash = - NominatorSlashInEra::::get(¶ms.slash_era, stash) - .unwrap_or_else(Zero::zero); + NominatorSlashInEra::::get(¶ms.slash_era, stash).unwrap_or_else(Zero::zero); era_slash += own_slash_difference; NominatorSlashInEra::::insert(¶ms.slash_era, stash, &era_slash); From 24f386e48a8aec0f321af8b64ef53026ecec1fd1 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Thu, 9 Mar 2023 09:52:58 +0530 Subject: [PATCH 58/67] Fix warning and update tests --- .../src/pallet/expand/store_trait.rs | 2 ++ .../procedural/src/storage/store_trait.rs | 2 -- frame/support/test/tests/pallet.rs | 11 --------- frame/support/test/tests/pallet_instance.rs | 2 -- .../tests/pallet_ui/deprecated_store_attr.rs | 24 +++++++++++++++++++ .../pallet_ui/deprecated_store_attr.stderr | 8 +++++++ .../tests/pallet_ui/duplicate_call_attr.rs | 1 - .../pallet_ui/duplicate_storage_prefix.rs | 1 - .../pallet_ui/store_trait_leak_private.stderr | 9 +++++++ 9 files changed, 43 insertions(+), 17 deletions(-) create mode 100644 frame/support/test/tests/pallet_ui/deprecated_store_attr.rs create mode 100644 frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs index 15a6a223e9708..f826fb837bf34 100644 --- a/frame/support/procedural/src/pallet/expand/store_trait.rs +++ b/frame/support/procedural/src/pallet/expand/store_trait.rs @@ -38,6 +38,8 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { &def.storages.iter().map(|storage| &storage.cfg_attrs).collect::>(); quote::quote_spanned!(trait_store.span() => + #[deprecated(note = r"Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. + Check https://github.com/paritytech/substrate/pull/13535 for more details.")] #trait_vis trait #trait_store { #( #(#storage_cfg_attrs)* diff --git a/frame/support/procedural/src/storage/store_trait.rs b/frame/support/procedural/src/storage/store_trait.rs index ef703b8af76c6..5dca502518a33 100644 --- a/frame/support/procedural/src/storage/store_trait.rs +++ b/frame/support/procedural/src/storage/store_trait.rs @@ -45,8 +45,6 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream { let where_clause = &def.where_clause; quote!( - #[deprecated(note = r"Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. - Check https://github.com/paritytech/substrate/pull/13535 for more details.")] #visibility trait #store_trait { #decl_store_items } diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs index c33d2c8c9cf25..8e77cd0251184 100644 --- a/frame/support/test/tests/pallet.rs +++ b/frame/support/test/tests/pallet.rs @@ -158,7 +158,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] #[pallet::storage_version(STORAGE_VERSION)] pub struct Pallet(_); @@ -496,7 +495,6 @@ pub mod pallet2 { } #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] #[pallet::without_storage_info] pub struct Pallet(_); @@ -946,15 +944,6 @@ fn validate_unsigned_expand() { assert_eq!(validity, ValidTransaction::default()); } -#[test] -fn trait_store_expand() { - TestExternalities::default().execute_with(|| { - as pallet::Store>::Value::get(); - as pallet::Store>::Map::get(1); - as pallet::Store>::DoubleMap::get(1, 2); - }) -} - #[test] fn pallet_expand_deposit_event() { TestExternalities::default().execute_with(|| { diff --git a/frame/support/test/tests/pallet_instance.rs b/frame/support/test/tests/pallet_instance.rs index 5beb1480a4e82..517f920c5ce07 100644 --- a/frame/support/test/tests/pallet_instance.rs +++ b/frame/support/test/tests/pallet_instance.rs @@ -46,7 +46,6 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::hooks] @@ -260,7 +259,6 @@ pub mod pallet2 { } #[pallet::pallet] - #[pallet::generate_store(pub(crate) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::event] diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs b/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs new file mode 100644 index 0000000000000..0475e5fe4fc49 --- /dev/null +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs @@ -0,0 +1,24 @@ +#[frame_support::pallet] +mod pallet { + use frame_support::pallet_prelude::Hooks; + use frame_system::pallet_prelude::BlockNumberFor; + use frame_support::pallet_prelude::StorageValue; + + #[pallet::config] + pub trait Config: frame_system::Config {} + + #[pallet::pallet] + #[pallet::generate_store(trait Store)] + pub struct Pallet(core::marker::PhantomData); + + #[pallet::hooks] + impl Hooks> for Pallet {} + + #[pallet::call] + impl Pallet {} + + #[pallet::storage] + type Foo = StorageValue<_, u8>; +} + +fn main() {} diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr new file mode 100644 index 0000000000000..1d7a09c41db9e --- /dev/null +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr @@ -0,0 +1,8 @@ +error: use of deprecated trait `pallet::Store`: Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. + Check https://github.com/paritytech/substrate/pull/13535 for more details. + --> $DIR/deprecated_store_attr.rs:11:33 + | +11 | #[pallet::generate_store(trait Store)] + | ^^^^^ + | + = note: `-D deprecated` implied by `-D warnings` diff --git a/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs b/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs index b8a32a0bd9f69..6d781a19e6742 100644 --- a/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs +++ b/frame/support/test/tests/pallet_ui/duplicate_call_attr.rs @@ -8,7 +8,6 @@ mod pallet { pub trait Config: frame_system::Config {} #[pallet::pallet] - #[pallet::generate_store(trait Store)] pub struct Pallet(core::marker::PhantomData); #[pallet::hooks] diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs index 5e99c84050c95..543c15bd06905 100644 --- a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs +++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.rs @@ -6,7 +6,6 @@ mod pallet { pub trait Config: frame_system::Config {} #[pallet::pallet] - #[pallet::generate_store(trait Store)] pub struct Pallet(core::marker::PhantomData); #[pallet::storage] diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr index d8c62faa303ee..07d7d3d129f2b 100644 --- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr +++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr @@ -1,3 +1,12 @@ +error: use of deprecated trait `pallet::Store`: Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. + Check https://github.com/paritytech/substrate/pull/13535 for more details. + --> $DIR/store_trait_leak_private.rs:11:37 + | +11 | #[pallet::generate_store(pub trait Store)] + | ^^^^^ + | + = note: `-D deprecated` implied by `-D warnings` + error[E0446]: private type `_GeneratedPrefixForStorageFoo` in public interface --> $DIR/store_trait_leak_private.rs:11:37 | From 4867664bf3fdce548e27259daa33c972c0aaf433 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Thu, 9 Mar 2023 10:00:50 +0530 Subject: [PATCH 59/67] Remove unnecessary allow deprecated --- frame/support/src/lib.rs | 1 - frame/support/src/storage/generator/double_map.rs | 1 - frame/support/src/storage/generator/map.rs | 1 - frame/support/src/storage/generator/mod.rs | 1 - frame/support/src/storage/generator/nmap.rs | 1 - 5 files changed, 5 deletions(-) diff --git a/frame/support/src/lib.rs b/frame/support/src/lib.rs index ea558888bf69c..4e9bc32b0043b 100644 --- a/frame/support/src/lib.rs +++ b/frame/support/src/lib.rs @@ -825,7 +825,6 @@ macro_rules! assert_error_encoded_size { pub use serde::{Deserialize, Serialize}; #[cfg(test)] -#[allow(deprecated)] pub mod tests { use super::*; use crate::metadata::{ diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs index fe749b32d8eb7..5763a472cd570 100644 --- a/frame/support/src/storage/generator/double_map.rs +++ b/frame/support/src/storage/generator/double_map.rs @@ -511,7 +511,6 @@ where /// Test iterators for StorageDoubleMap #[cfg(test)] -#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs index 59d37e35a0107..fb499384f1506 100644 --- a/frame/support/src/storage/generator/map.rs +++ b/frame/support/src/storage/generator/map.rs @@ -346,7 +346,6 @@ impl> storage::StorageMap /// Test iterators for StorageMap #[cfg(test)] -#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, diff --git a/frame/support/src/storage/generator/mod.rs b/frame/support/src/storage/generator/mod.rs index ce8edabee5634..2da612b24de8f 100644 --- a/frame/support/src/storage/generator/mod.rs +++ b/frame/support/src/storage/generator/mod.rs @@ -36,7 +36,6 @@ pub use value::StorageValue; #[cfg(test)] #[allow(dead_code)] -#[allow(deprecated)] mod tests { use crate::{ assert_noop, assert_ok, diff --git a/frame/support/src/storage/generator/nmap.rs b/frame/support/src/storage/generator/nmap.rs index 960c5d8f3dbc8..21fe7b41eda99 100755 --- a/frame/support/src/storage/generator/nmap.rs +++ b/frame/support/src/storage/generator/nmap.rs @@ -459,7 +459,6 @@ impl> /// Test iterators for StorageNMap #[cfg(test)] -#[allow(deprecated)] mod test_iterators { use crate::{ hash::StorageHasher, From be55375633d15fb3273a739a69f267e33651949d Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Thu, 9 Mar 2023 10:35:48 +0530 Subject: [PATCH 60/67] Remove use of trait Store --- bin/node-template/pallets/template/src/lib.rs | 1 - test-utils/runtime/src/system.rs | 1 - utils/frame/rpc/support/src/lib.rs | 1 - 3 files changed, 3 deletions(-) diff --git a/bin/node-template/pallets/template/src/lib.rs b/bin/node-template/pallets/template/src/lib.rs index 4630e344add31..9f17623db328f 100644 --- a/bin/node-template/pallets/template/src/lib.rs +++ b/bin/node-template/pallets/template/src/lib.rs @@ -20,7 +20,6 @@ pub mod pallet { use frame_system::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); /// Configure the pallet by specifying the parameters and types on which it depends. diff --git a/test-utils/runtime/src/system.rs b/test-utils/runtime/src/system.rs index 657e3c90fa6d3..12ebf486bb1b9 100644 --- a/test-utils/runtime/src/system.rs +++ b/test-utils/runtime/src/system.rs @@ -47,7 +47,6 @@ mod pallet { use frame_support::pallet_prelude::*; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] pub struct Pallet(PhantomData); diff --git a/utils/frame/rpc/support/src/lib.rs b/utils/frame/rpc/support/src/lib.rs index c0ec8befc4bee..eecc80c408efd 100644 --- a/utils/frame/rpc/support/src/lib.rs +++ b/utils/frame/rpc/support/src/lib.rs @@ -94,7 +94,6 @@ use sp_storage::{StorageData, StorageKey}; /// use frame_support::pallet_prelude::*; /// /// #[pallet::pallet] -/// #[pallet::generate_store(pub(super) trait Store)] /// pub struct Pallet(PhantomData); /// /// #[pallet::config] From 7b2710a7cb542fd9edc436ce0d2a51149031a29a Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Thu, 9 Mar 2023 13:14:42 +0530 Subject: [PATCH 61/67] Fix mismatch in expected output --- .../pallet_ui/duplicate_call_attr.stderr | 4 +-- .../pallet_ui/duplicate_storage_prefix.stderr | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr b/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr index c2956717bb2bb..2b03f41024351 100644 --- a/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr +++ b/frame/support/test/tests/pallet_ui/duplicate_call_attr.stderr @@ -1,5 +1,5 @@ error: Invalid duplicated attribute - --> $DIR/duplicate_call_attr.rs:23:12 + --> $DIR/duplicate_call_attr.rs:22:12 | -23 | #[pallet::call] +22 | #[pallet::call] | ^^^^ diff --git a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr index 716888c9d8b65..75297dc5a7f79 100644 --- a/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr +++ b/frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr @@ -1,47 +1,47 @@ error: Duplicate storage prefixes found for `Foo` - --> $DIR/duplicate_storage_prefix.rs:16:29 + --> $DIR/duplicate_storage_prefix.rs:15:29 | -16 | #[pallet::storage_prefix = "Foo"] +15 | #[pallet::storage_prefix = "Foo"] | ^^^^^ error: Duplicate storage prefixes found for `Foo` - --> $DIR/duplicate_storage_prefix.rs:13:7 + --> $DIR/duplicate_storage_prefix.rs:12:7 | -13 | type Foo = StorageValue<_, u8>; +12 | type Foo = StorageValue<_, u8>; | ^^^ error: Duplicate storage prefixes found for `CounterForBar`, used for counter associated to counted storage map - --> $DIR/duplicate_storage_prefix.rs:23:7 + --> $DIR/duplicate_storage_prefix.rs:22:7 | -23 | type Bar = CountedStorageMap<_, Twox64Concat, u16, u16>; +22 | type Bar = CountedStorageMap<_, Twox64Concat, u16, u16>; | ^^^ error: Duplicate storage prefixes found for `CounterForBar` - --> $DIR/duplicate_storage_prefix.rs:20:7 + --> $DIR/duplicate_storage_prefix.rs:19:7 | -20 | type CounterForBar = StorageValue<_, u16>; +19 | type CounterForBar = StorageValue<_, u16>; | ^^^^^^^^^^^^^ error[E0412]: cannot find type `_GeneratedPrefixForStorageFoo` in this scope - --> $DIR/duplicate_storage_prefix.rs:13:7 + --> $DIR/duplicate_storage_prefix.rs:12:7 | -13 | type Foo = StorageValue<_, u8>; +12 | type Foo = StorageValue<_, u8>; | ^^^ not found in this scope error[E0412]: cannot find type `_GeneratedPrefixForStorageNotFoo` in this scope - --> $DIR/duplicate_storage_prefix.rs:17:7 + --> $DIR/duplicate_storage_prefix.rs:16:7 | -17 | type NotFoo = StorageValue<_, u16>; +16 | type NotFoo = StorageValue<_, u16>; | ^^^^^^ not found in this scope error[E0412]: cannot find type `_GeneratedPrefixForStorageCounterForBar` in this scope - --> $DIR/duplicate_storage_prefix.rs:20:7 + --> $DIR/duplicate_storage_prefix.rs:19:7 | -20 | type CounterForBar = StorageValue<_, u16>; +19 | type CounterForBar = StorageValue<_, u16>; | ^^^^^^^^^^^^^ not found in this scope error[E0412]: cannot find type `_GeneratedPrefixForStorageBar` in this scope - --> $DIR/duplicate_storage_prefix.rs:23:7 + --> $DIR/duplicate_storage_prefix.rs:22:7 | -23 | type Bar = CountedStorageMap<_, Twox64Concat, u16, u16>; +22 | type Bar = CountedStorageMap<_, Twox64Concat, u16, u16>; | ^^^ not found in this scope From 27775d87786a565b759a7ef248b8d8d0755f446b Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 11 Mar 2023 11:25:18 +0530 Subject: [PATCH 62/67] Minor update to warning message for deprecation of generate_store with Store trait attribute --- frame/support/procedural/src/pallet/expand/store_trait.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs index f826fb837bf34..55d43b627ab75 100644 --- a/frame/support/procedural/src/pallet/expand/store_trait.rs +++ b/frame/support/procedural/src/pallet/expand/store_trait.rs @@ -38,7 +38,7 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { &def.storages.iter().map(|storage| &storage.cfg_attrs).collect::>(); quote::quote_spanned!(trait_store.span() => - #[deprecated(note = r"Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. + #[deprecated(note = r"Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details.")] #trait_vis trait #trait_store { #( From 4a97fec631bb6edb412c83bbd581a3bbaee9cad1 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sat, 11 Mar 2023 19:38:32 +0530 Subject: [PATCH 63/67] Fixes as per review comments --- .../procedural/src/pallet/parse/pallet_struct.rs | 5 ++++- .../test/tests/pallet_ui/deprecated_store_attr.rs | 13 ------------- .../tests/pallet_ui/deprecated_store_attr.stderr | 14 +++++++------- .../pallet_ui/store_trait_leak_private.stderr | 10 +++++----- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs index 571298d5a12ec..144b270c5e8f5 100644 --- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs +++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs @@ -84,7 +84,10 @@ impl syn::parse::Parse for PalletStructAttr { syn::parenthesized!(generate_content in content); let vis = generate_content.parse::()?; generate_content.parse::()?; - let keyword = generate_content.parse::()?; + let mut keyword = generate_content.parse::()?; + // set span of Store keyword same to attirbute macro `generate_store` + // so that deprecated warning highlights use of macro. + keyword.span = content.span(); Ok(Self::GenerateStore { vis, keyword, span }) } else if lookahead.peek(keyword::without_storage_info) { let span = content.parse::()?.span(); diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs b/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs index 0475e5fe4fc49..0799a3fce8d58 100644 --- a/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.rs @@ -1,24 +1,11 @@ #[frame_support::pallet] mod pallet { - use frame_support::pallet_prelude::Hooks; - use frame_system::pallet_prelude::BlockNumberFor; - use frame_support::pallet_prelude::StorageValue; - #[pallet::config] pub trait Config: frame_system::Config {} #[pallet::pallet] #[pallet::generate_store(trait Store)] pub struct Pallet(core::marker::PhantomData); - - #[pallet::hooks] - impl Hooks> for Pallet {} - - #[pallet::call] - impl Pallet {} - - #[pallet::storage] - type Foo = StorageValue<_, u8>; } fn main() {} diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr index 1d7a09c41db9e..ff0fea7223510 100644 --- a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr @@ -1,8 +1,8 @@ -error: use of deprecated trait `pallet::Store`: Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. +error: use of deprecated trait `pallet::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. - --> $DIR/deprecated_store_attr.rs:11:33 - | -11 | #[pallet::generate_store(trait Store)] - | ^^^^^ - | - = note: `-D deprecated` implied by `-D warnings` + --> tests/pallet_ui/deprecated_store_attr.rs:7:3 + | +7 | #[pallet::generate_store(trait Store)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = note: `-D deprecated` implied by `-D warnings` diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr index 07d7d3d129f2b..a4876c10bf016 100644 --- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr +++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr @@ -1,17 +1,17 @@ -error: use of deprecated trait `pallet::Store`: Use of #[pallet::generate_store(pub(super) trait Store)] will be removed soon. +error: use of deprecated trait `pallet::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. - --> $DIR/store_trait_leak_private.rs:11:37 + --> tests/pallet_ui/store_trait_leak_private.rs:11:3 | 11 | #[pallet::generate_store(pub trait Store)] - | ^^^^^ + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D deprecated` implied by `-D warnings` error[E0446]: private type `_GeneratedPrefixForStorageFoo` in public interface - --> $DIR/store_trait_leak_private.rs:11:37 + --> tests/pallet_ui/store_trait_leak_private.rs:11:3 | 11 | #[pallet::generate_store(pub trait Store)] - | ^^^^^ can't leak private type + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type ... 20 | #[pallet::storage] | ------- `_GeneratedPrefixForStorageFoo` declared as private From ed2a1707d532298ea1e4292b6313d5e2506d2154 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Sun, 12 Mar 2023 11:56:13 +0530 Subject: [PATCH 64/67] Fixes as per review suggestions --- .../procedural/src/pallet/expand/store_trait.rs | 15 ++++++++++++--- .../procedural/src/pallet/parse/pallet_struct.rs | 15 ++++++--------- .../tests/pallet_ui/deprecated_store_attr.stderr | 3 ++- .../tests/pallet_ui/duplicate_store_attr.stderr | 4 ++-- .../pallet_ui/store_trait_leak_private.stderr | 7 ++++--- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs index 55d43b627ab75..b28971be95b6a 100644 --- a/frame/support/procedural/src/pallet/expand/store_trait.rs +++ b/frame/support/procedural/src/pallet/expand/store_trait.rs @@ -22,7 +22,7 @@ use syn::spanned::Spanned; /// * generate Store trait with all storages, /// * implement Store trait for Pallet. pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { - let (trait_vis, trait_store) = + let (trait_vis, trait_store, attribute_span) = if let Some(store) = &def.pallet_struct.store { store } else { return Default::default() }; let type_impl_gen = &def.type_impl_generics(trait_store.span()); @@ -36,10 +36,19 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { let storage_names = &def.storages.iter().map(|storage| &storage.ident).collect::>(); let storage_cfg_attrs = &def.storages.iter().map(|storage| &storage.cfg_attrs).collect::>(); + let warnig_struct_name = syn::Ident::new("Store", *attribute_span); + let warning: syn::ItemStruct = syn::parse_quote!( + #[deprecated(note = r" + Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. + Check https://github.com/paritytech/substrate/pull/13535 for more details.")] + struct #warnig_struct_name; + ); quote::quote_spanned!(trait_store.span() => - #[deprecated(note = r"Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. - Check https://github.com/paritytech/substrate/pull/13535 for more details.")] + mod warnig { + #warning + const _: Option<#warnig_struct_name> = None; + } #trait_vis trait #trait_store { #( #(#storage_cfg_attrs)* diff --git a/frame/support/procedural/src/pallet/parse/pallet_struct.rs b/frame/support/procedural/src/pallet/parse/pallet_struct.rs index 144b270c5e8f5..98312d0652d8e 100644 --- a/frame/support/procedural/src/pallet/parse/pallet_struct.rs +++ b/frame/support/procedural/src/pallet/parse/pallet_struct.rs @@ -38,7 +38,7 @@ pub struct PalletStructDef { /// The keyword Pallet used (contains span). pub pallet: keyword::Pallet, /// Whether the trait `Store` must be generated. - pub store: Option<(syn::Visibility, keyword::Store)>, + pub store: Option<(syn::Visibility, keyword::Store, proc_macro2::Span)>, /// The span of the pallet::pallet attribute. pub attr_span: proc_macro2::Span, /// Whether to specify the storages max encoded len when implementing `StorageInfoTrait`. @@ -78,16 +78,13 @@ impl syn::parse::Parse for PalletStructAttr { let lookahead = content.lookahead1(); if lookahead.peek(keyword::generate_store) { - let span = content.parse::()?.span(); - + content.parse::()?; let generate_content; syn::parenthesized!(generate_content in content); let vis = generate_content.parse::()?; generate_content.parse::()?; - let mut keyword = generate_content.parse::()?; - // set span of Store keyword same to attirbute macro `generate_store` - // so that deprecated warning highlights use of macro. - keyword.span = content.span(); + let keyword = generate_content.parse::()?; + let span = content.span(); Ok(Self::GenerateStore { vis, keyword, span }) } else if lookahead.peek(keyword::without_storage_info) { let span = content.parse::()?.span(); @@ -126,8 +123,8 @@ impl PalletStructDef { let struct_attrs: Vec = helper::take_item_pallet_attrs(&mut item.attrs)?; for attr in struct_attrs { match attr { - PalletStructAttr::GenerateStore { vis, keyword, .. } if store.is_none() => { - store = Some((vis, keyword)); + PalletStructAttr::GenerateStore { vis, keyword, span } if store.is_none() => { + store = Some((vis, keyword, span)); }, PalletStructAttr::WithoutStorageInfoTrait(span) if without_storage_info.is_none() => diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr index ff0fea7223510..687e8f989fa5d 100644 --- a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr @@ -1,4 +1,5 @@ -error: use of deprecated trait `pallet::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. +error: use of deprecated struct `pallet::warnig::Store`: + Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/deprecated_store_attr.rs:7:3 | diff --git a/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr index 232144b8deaca..1c13ee17eb751 100644 --- a/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr +++ b/frame/support/test/tests/pallet_ui/duplicate_store_attr.stderr @@ -1,5 +1,5 @@ error: Unexpected duplicated attribute - --> $DIR/duplicate_store_attr.rs:12:12 + --> tests/pallet_ui/duplicate_store_attr.rs:12:3 | 12 | #[pallet::generate_store(trait Store)] - | ^^^^^^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr index a4876c10bf016..408d0620b27c9 100644 --- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr +++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr @@ -1,4 +1,5 @@ -error: use of deprecated trait `pallet::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. +error: use of deprecated struct `pallet::warnig::Store`: + Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/store_trait_leak_private.rs:11:3 | @@ -8,10 +9,10 @@ error: use of deprecated trait `pallet::Store`: Use of `#[pallet::generate_store = note: `-D deprecated` implied by `-D warnings` error[E0446]: private type `_GeneratedPrefixForStorageFoo` in public interface - --> tests/pallet_ui/store_trait_leak_private.rs:11:3 + --> tests/pallet_ui/store_trait_leak_private.rs:11:37 | 11 | #[pallet::generate_store(pub trait Store)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private type + | ^^^^^ can't leak private type ... 20 | #[pallet::storage] | ------- `_GeneratedPrefixForStorageFoo` declared as private From 7d0f130e292de017f35e108f64d47b87f7ad1c3d Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Mon, 13 Mar 2023 15:23:35 +0530 Subject: [PATCH 65/67] Remove use of Store trait from core-fellowship pallet --- frame/core-fellowship/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/frame/core-fellowship/src/lib.rs b/frame/core-fellowship/src/lib.rs index 6ba60dbaf2559..93d2302448989 100644 --- a/frame/core-fellowship/src/lib.rs +++ b/frame/core-fellowship/src/lib.rs @@ -148,7 +148,6 @@ pub mod pallet { const RANK_COUNT: usize = 9; #[pallet::pallet] - #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(PhantomData<(T, I)>); #[pallet::config] From 637d0ea0012df2ef937ed863a2e57534ba9e33f4 Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Mon, 13 Mar 2023 15:50:38 +0530 Subject: [PATCH 66/67] Fix type in store_trait.rs --- frame/support/procedural/src/pallet/expand/store_trait.rs | 2 +- frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr | 2 +- .../test/tests/pallet_ui/store_trait_leak_private.stderr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs index b28971be95b6a..63d332ca99e73 100644 --- a/frame/support/procedural/src/pallet/expand/store_trait.rs +++ b/frame/support/procedural/src/pallet/expand/store_trait.rs @@ -45,7 +45,7 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { ); quote::quote_spanned!(trait_store.span() => - mod warnig { + mod warning { #warning const _: Option<#warnig_struct_name> = None; } diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr index 687e8f989fa5d..740b2715b3059 100644 --- a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr @@ -1,4 +1,4 @@ -error: use of deprecated struct `pallet::warnig::Store`: +error: use of deprecated struct `pallet::warning::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/deprecated_store_attr.rs:7:3 diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr index 408d0620b27c9..f1ae2aa6c4cd1 100644 --- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr +++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr @@ -1,4 +1,4 @@ -error: use of deprecated struct `pallet::warnig::Store`: +error: use of deprecated struct `pallet::warning::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/store_trait_leak_private.rs:11:3 From 7bbedf12bcbe2f83446b06b6fdde77720e14996d Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Mon, 13 Mar 2023 19:37:16 +0530 Subject: [PATCH 67/67] Fixes as pre review comment --- frame/support/procedural/src/pallet/expand/store_trait.rs | 4 ++-- .../support/test/tests/pallet_ui/deprecated_store_attr.stderr | 2 +- .../test/tests/pallet_ui/store_trait_leak_private.stderr | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frame/support/procedural/src/pallet/expand/store_trait.rs b/frame/support/procedural/src/pallet/expand/store_trait.rs index 63d332ca99e73..251c88f08e7a0 100644 --- a/frame/support/procedural/src/pallet/expand/store_trait.rs +++ b/frame/support/procedural/src/pallet/expand/store_trait.rs @@ -45,10 +45,10 @@ pub fn expand_store_trait(def: &mut Def) -> proc_macro2::TokenStream { ); quote::quote_spanned!(trait_store.span() => - mod warning { + const _:() = { #warning const _: Option<#warnig_struct_name> = None; - } + }; #trait_vis trait #trait_store { #( #(#storage_cfg_attrs)* diff --git a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr index 740b2715b3059..bbc4743fc1003 100644 --- a/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr +++ b/frame/support/test/tests/pallet_ui/deprecated_store_attr.stderr @@ -1,4 +1,4 @@ -error: use of deprecated struct `pallet::warning::Store`: +error: use of deprecated struct `pallet::_::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/deprecated_store_attr.rs:7:3 diff --git a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr index f1ae2aa6c4cd1..24fda4ff1abbf 100644 --- a/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr +++ b/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr @@ -1,4 +1,4 @@ -error: use of deprecated struct `pallet::warning::Store`: +error: use of deprecated struct `pallet::_::Store`: Use of `#[pallet::generate_store(pub(super) trait Store)]` will be removed soon. Check https://github.com/paritytech/substrate/pull/13535 for more details. --> tests/pallet_ui/store_trait_leak_private.rs:11:3