remove more stuff

paritytech · Mar 23, 2022 · 83406db · 83406db
1 parent faae51e
commit 83406db
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 16 deletions.
diff --git a/runtime/parachains/src/configuration.rs b/runtime/parachains/src/configuration.rs
@@ -479,13 +479,6 @@ pub mod pallet {
 	pub(crate) type ActiveConfig<T: Config> =
 		StorageValue<_, HostConfiguration<T::BlockNumber>, ValueQuery>;
 
-	/// Pending configuration (if any) for the next session.
-	///
-	/// DEPRECATED: This is no longer used, and will be removed in the future.
-	#[pallet::storage]
-	pub(crate) type PendingConfig<T: Config> =
-		StorageMap<_, Twox64Concat, SessionIndex, migration::v1::HostConfiguration<T::BlockNumber>>;
-
 	/// Pending configuration changes.
 	///
 	/// This is a list of configuration changes, each with a session index at which it should

diff --git a/runtime/parachains/src/configuration/migration.rs b/runtime/parachains/src/configuration/migration.rs
@@ -16,10 +16,7 @@
 
 //! A module that is responsible for migration of storage.
 
-use crate::configuration::{self, Config, Pallet, Store};
-use frame_support::{pallet_prelude::*, traits::StorageVersion, weights::Weight};
-use frame_system::pallet_prelude::BlockNumberFor;
-use sp_std::prelude::*;
+use frame_support::traits::StorageVersion;
 
 /// The current storage version.
 ///

diff --git a/runtime/parachains/src/configuration/tests.rs b/runtime/parachains/src/configuration/tests.rs
@@ -338,8 +338,6 @@ fn setting_pending_config_members() {
 			minimum_validation_upgrade_delay: 20,
 		};
 
-		assert!(<Configuration as Store>::PendingConfig::get(shared::SESSION_DELAY).is_none());
-
 		Configuration::set_validation_upgrade_cooldown(
 			Origin::root(),
 			new_config.validation_upgrade_cooldown,

diff --git a/runtime/parachains/src/session_info.rs b/runtime/parachains/src/session_info.rs
@@ -37,7 +37,6 @@ mod tests;
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_system::pallet_prelude::BlockNumberFor;
 
 	#[pallet::pallet]
 	#[pallet::generate_store(pub(super) trait Store)]

diff --git a/runtime/parachains/src/session_info/migration.rs b/runtime/parachains/src/session_info/migration.rs
@@ -16,8 +16,7 @@
 
 //! A module that is responsible for migration of storage.
 
-use crate::session_info::{Config, Pallet, Store};
-use frame_support::{pallet_prelude::*, traits::StorageVersion, weights::Weight};
+use frame_support::traits::StorageVersion;
 
 /// The current storage version.
 pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);