[FRAME] Cleanup storage generator traits

bridges/bin/runtime-common/src/integrity.rs

@@ -23,7 +23,7 @@ use bp_header_chain::ChainWithGrandpa;
 use bp_messages::{ChainWithMessages, InboundLaneData, MessageNonce};
 use bp_runtime::Chain;
 use codec::Encode;
-use frame_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::Weight};
 use frame_system::limits;
 use pallet_bridge_messages::WeightInfoExt as _;
 

bridges/modules/grandpa/src/lib.rs

@@ -844,7 +844,6 @@ mod tests {
 	use frame_support::{
 		assert_err, assert_noop, assert_ok,
 		dispatch::{Pays, PostDispatchInfo},
-		storage::generator::StorageValue,
 	};
 	use frame_system::{EventRecord, Phase};
 	use sp_consensus_grandpa::{ConsensusLog, GRANDPA_ENGINE_ID};

bridges/modules/messages/src/tests/pallet_tests.rs

@@ -37,12 +37,7 @@ use bp_messages::{
 use bp_runtime::{BasicOperatingMode, PreComputedSize, RangeInclusiveExt, Size};
 use bp_test_utils::generate_owned_bridge_module_tests;
 use codec::Encode;
-use frame_support::{
-	assert_err, assert_noop, assert_ok,
-	dispatch::Pays,
-	storage::generator::{StorageMap, StorageValue},
-	weights::Weight,
-};
+use frame_support::{assert_err, assert_noop, assert_ok, dispatch::Pays, weights::Weight};
 use frame_system::{EventRecord, Pallet as System, Phase};
 use sp_core::Get;
 use sp_runtime::{BoundedVec, DispatchError};

bridges/modules/parachains/src/lib.rs

@@ -846,12 +846,8 @@ pub(crate) mod tests {
 		TEST_GRANDPA_SET_ID,
 	};
 	use frame_support::{
-		assert_noop, assert_ok,
-		dispatch::DispatchResultWithPostInfo,
-		pallet_prelude::Pays,
-		storage::generator::{StorageDoubleMap, StorageMap},
-		traits::Get,
-		weights::Weight,
+		assert_noop, assert_ok, dispatch::DispatchResultWithPostInfo, pallet_prelude::Pays,
+		traits::Get, weights::Weight,
 	};
 	use frame_system::{EventRecord, Pallet as System, Phase};
 	use sp_core::Hasher;

prdoc/pr_5408.prdoc

@@ -0,0 +1,29 @@
+title: [FRAME] Cleanup storage generator types
+doc:
+  - audience: Runtime Dev
+    description: |
+      V1 pallet syntax has been deprecated and so the generator traits no longer needed, 
+      However, all methods have been ported over to `storage::types` and made public for developers
+      that require them.
+      ...
+
+crates: 
+    - name: frame-support
+      bump: minor
+    - name: bridge-runtime-common
+      bump: minor
+    - name: pallet-bridge-grandpa
+      bump: minor
+    - name: pallet-bridge-messages
+      bump: minor
+    - name: pallet-bridge-parachains
+      bump: minor
+    - name: pallet-bags-list-remote-tests
+      bump: minor
+    - name: pallet-bounties
+      bump: minor
+    - name: pallet-session
+      bump: minor
+    - name: substrate-frame-rpc-support
+      bump: minor
+

substrate/frame/bags-list/remote-tests/src/snapshot.rs

@@ -31,7 +31,6 @@ where
 	Block: BlockT + DeserializeOwned,
 	Block::Header: DeserializeOwned,
 {
-	use frame_support::storage::generator::StorageMap;
 
 	let mut ext = Builder::<Block>::new()
 		.mode(Mode::Online(OnlineConfig {

substrate/frame/bags-list/remote-tests/src/try_state.rs

@@ -17,7 +17,6 @@
 //! Test to execute the sanity-check of the voter bag.
 
 use frame_support::{
-	storage::generator::StorageMap,
 	traits::{Get, PalletInfoAccess},
 };
 use remote_externalities::{Builder, Mode, OnlineConfig};

substrate/frame/bounties/src/migrations/v4.rs

@@ -17,7 +17,6 @@
 
 use core::str;
 use frame_support::{
-	storage::{generator::StorageValue, StoragePrefixedMap},
 	traits::{
 		Get, GetStorageVersion, PalletInfoAccess, StorageVersion,
 		STORAGE_VERSION_STORAGE_KEY_POSTFIX,

substrate/frame/session/src/migrations/v1.rs

@@ -19,7 +19,6 @@ use core::str;
 use sp_io::hashing::twox_128;
 
 use frame_support::{
-	storage::{generator::StorageValue, StoragePrefixedMap},
 	traits::{
 		Get, GetStorageVersion, PalletInfoAccess, StorageVersion,
 		STORAGE_VERSION_STORAGE_KEY_POSTFIX,