Remove migrations (#2681)

* remove migrations * add EnsureStateDecodes * fix clippy
AcalaNetwork · Dec 21, 2023 · 878819c · 878819c
1 parent f59e1e1
commit 878819c
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 221 deletions.
diff --git a/modules/homa/src/lib.rs b/modules/homa/src/lib.rs
@@ -39,7 +39,6 @@ use sp_std::{cmp::Ordering, convert::From, prelude::*, vec, vec::Vec};
 pub use module::*;
 pub use weights::WeightInfo;
 
-pub mod migrations;
 mod mock;
 mod tests;
 pub mod weights;

diff --git a/modules/homa/src/migrations/mod.rs b/modules/homa/src/migrations/mod.rs
diff --git a/modules/homa/src/migrations/v1.rs b/modules/homa/src/migrations/v1.rs
diff --git a/modules/session-manager/src/lib.rs b/modules/session-manager/src/lib.rs
@@ -36,7 +36,6 @@ use sp_runtime::{
 };
 use sp_staking::SessionIndex;
 
-pub mod migrations;
 mod mock;
 mod tests;
 pub mod weights;

diff --git a/modules/session-manager/src/migrations.rs b/modules/session-manager/src/migrations.rs
diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs
@@ -28,7 +28,6 @@ use sp_core::H160;
 use sp_runtime::DispatchResult;
 use sp_std::{prelude::*, vec::Vec};
 
-pub mod migrations;
 mod mock;
 mod tests;
 pub mod weights;

diff --git a/modules/transaction-pause/src/migrations.rs b/modules/transaction-pause/src/migrations.rs
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
@@ -1889,8 +1889,17 @@ pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive =
-	frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllPalletsWithSystem, ()>;
+pub type Executive = frame_executive::Executive<
+	Runtime,
+	Block,
+	frame_system::ChainContext<Runtime>,
+	Runtime,
+	AllPalletsWithSystem,
+	Migrations,
+>;
+
+#[allow(unused_parens)]
+type Migrations = ();
 
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]

diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
@@ -78,7 +78,7 @@ use frame_support::{
 		tokens::{PayFromAccount, UnityAssetBalanceConversion},
 		ConstBool, ConstU128, ConstU32, Contains, ContainsLengthBound, Currency as PalletCurrency, Currency,
 		EnsureOrigin, EqualPrivilegeOnly, Get, Imbalance, InstanceFilter, LinearStoragePrice, LockIdentifier,
-		OnRuntimeUpgrade, OnUnbalanced, SortedMembers,
+		OnUnbalanced, SortedMembers,
 	},
 	weights::{constants::RocksDbWeight, ConstantMultiplier, Weight},
 	PalletId,
@@ -1893,20 +1893,17 @@ pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive =
-	frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllPalletsWithSystem, ()>;
-
-pub struct MigrateSetXcmVersionForKusama;
-impl OnRuntimeUpgrade for MigrateSetXcmVersionForKusama {
-	fn on_runtime_upgrade() -> Weight {
-		let _ = PolkadotXcm::force_xcm_version(
-			RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(1, Junctions::Here)),
-			3,
-		);
-		RocksDbWeight::get().writes(1)
-	}
-}
+pub type Executive = frame_executive::Executive<
+	Runtime,
+	Block,
+	frame_system::ChainContext<Runtime>,
+	Runtime,
+	AllPalletsWithSystem,
+	Migrations,
+>;
+
+#[allow(unused_parens)]
+type Migrations = ();
 
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]

diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
@@ -1974,8 +1974,17 @@ pub type SignedPayload = generic::SignedPayload<RuntimeCall, SignedExtra>;
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive =
-	frame_executive::Executive<Runtime, Block, frame_system::ChainContext<Runtime>, Runtime, AllPalletsWithSystem, ()>;
+pub type Executive = frame_executive::Executive<
+	Runtime,
+	Block,
+	frame_system::ChainContext<Runtime>,
+	Runtime,
+	AllPalletsWithSystem,
+	Migrations,
+>;
+
+#[allow(unused_parens)]
+type Migrations = ();
 
 construct_runtime!(
 	pub enum Runtime {