Remove deprecated stuff

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

frame/support/test/tests/construct_runtime.rs

@@ -24,7 +24,7 @@
 use codec::MaxEncodedLen;
 use frame_support::{parameter_types, traits::PalletInfo as _};
 use scale_info::TypeInfo;
-use sp_core::{sr25519, H256};
+use sp_core::sr25519;
 use sp_runtime::{
 	generic,
 	traits::{BlakeTwo256, Verify},
@@ -35,14 +35,13 @@ parameter_types! {
 	pub static IntegrityTestExec: u32 = 0;
 }
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 mod module1 {
 	use self::frame_system::pallet_prelude::*;
 	use frame_support::pallet_prelude::*;
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]
@@ -75,15 +74,14 @@ mod module1 {
 	}
 }
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 mod module2 {
 	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]
@@ -124,15 +122,14 @@ mod module2 {
 mod nested {
 	use super::*;
 
-	#[frame_support::pallet]
+	#[frame_support::pallet(dev_mode)]
 	pub mod module3 {
 		use self::frame_system::pallet_prelude::*;
 		use super::*;
 		use frame_support::pallet_prelude::*;
 		use frame_support_test as frame_system;
 
 		#[pallet::pallet]
-		#[pallet::generate_store(pub(super) trait Store)]
 		pub struct Pallet<T>(PhantomData<T>);
 
 		#[pallet::config]
@@ -181,15 +178,14 @@ mod nested {
 	}
 }
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod module3 {
 	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]

frame/support/test/tests/final_keys.rs

@@ -34,7 +34,6 @@ mod no_instance {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]
@@ -109,7 +108,6 @@ mod instance {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]

frame/support/test/tests/genesisconfig.rs

@@ -28,7 +28,6 @@ pub mod pallet {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]

frame/support/test/tests/instance.rs

@@ -37,15 +37,14 @@ pub trait Currency {}
 // Test for:
 // * No default instance
 // * Origin, Inherent, Event
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 mod module1 {
 	use self::frame_system::pallet_prelude::*;
 	use super::*;
 	use frame_support::pallet_prelude::*;
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]
@@ -154,7 +153,6 @@ mod module2 {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]
@@ -257,7 +255,6 @@ mod module3 {
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
 	#[pallet::config]
@@ -449,7 +446,7 @@ fn storage_with_instance_basic_operation() {
 
 fn expected_metadata() -> PalletStorageMetadataIR {
 	PalletStorageMetadataIR {
-		prefix: "Instance2Module2",
+		prefix: "Module2_2",
 		entries: vec![
 			StorageEntryMetadataIR {
 				name: "Value",

frame/support/test/tests/issue2219.rs

@@ -80,7 +80,6 @@ mod module {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]

frame/support/test/tests/origin.rs

@@ -23,14 +23,13 @@ use frame_support::traits::{Contains, OriginTrait};
 use sp_runtime::{generic, traits::BlakeTwo256};
 
 mod nested {
-	#[frame_support::pallet]
+	#[frame_support::pallet(dev_mode)]
 	pub mod module {
 		use self::frame_system::pallet_prelude::*;
 		use frame_support::pallet_prelude::*;
 		use frame_support_test as frame_system;
 
 		#[pallet::pallet]
-		#[pallet::generate_store(pub(super) trait Store)]
 		pub struct Pallet<T>(PhantomData<T>);
 
 		#[pallet::config]
@@ -72,14 +71,13 @@ mod nested {
 	}
 }
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod module {
 	use self::frame_system::pallet_prelude::*;
 	use frame_support::pallet_prelude::*;
 	use frame_support_test as frame_system;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 
 	#[pallet::config]