Fix warning and update tests

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::<Vec<_>>();
 
 	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)*

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
 		}

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<T>(_);
 
@@ -496,7 +495,6 @@ pub mod pallet2 {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(crate) trait Store)]
 	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
@@ -946,15 +944,6 @@ fn validate_unsigned_expand() {
 	assert_eq!(validity, ValidTransaction::default());
 }
 
-#[test]
-fn trait_store_expand() {
-	TestExternalities::default().execute_with(|| {
-		<pallet::Pallet<Runtime> as pallet::Store>::Value::get();
-		<pallet::Pallet<Runtime> as pallet::Store>::Map::get(1);
-		<pallet::Pallet<Runtime> as pallet::Store>::DoubleMap::get(1, 2);
-	})
-}
-
 #[test]
 fn pallet_expand_deposit_event() {
 	TestExternalities::default().execute_with(|| {

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<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::hooks]
@@ -260,7 +259,6 @@ pub mod pallet2 {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(crate) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::event]

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<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::storage]
+	type Foo<T> = StorageValue<_, u8>;
+}
+
+fn main() {}

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`

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<T>(core::marker::PhantomData<T>);
 
 	#[pallet::hooks]

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<T>(core::marker::PhantomData<T>);
 
 	#[pallet::storage]

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<T>` in public interface
   --> $DIR/store_trait_leak_private.rs:11:37
    |