From dbbb7ce2b9c8a097ec4f1bafa7615c994a9ae92f Mon Sep 17 00:00:00 2001
From: Nathy-bajo <bajon7680@gmail.com>
Date: Wed, 22 Jan 2025 07:51:53 +0100
Subject: [PATCH] migrate pallet-society to use umbrella crate

---
 substrate/frame/society/src/migrations.rs | 9 +++++----
 substrate/frame/src/lib.rs                | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/substrate/frame/society/src/migrations.rs b/substrate/frame/society/src/migrations.rs
index c1ed90e9e31dd..6b4d26876ce37 100644
--- a/substrate/frame/society/src/migrations.rs
+++ b/substrate/frame/society/src/migrations.rs
@@ -21,6 +21,8 @@ use super::*;
 use alloc::{vec, vec::Vec};
 use codec::{Decode, Encode};
 use frame::try_runtime::TryRuntimeError;
+use frame::testing_prelude::*;
+use frame::runtime::prelude::storage::unhashed;
 
 /// The log target.
 const TARGET: &'static str = "runtime::society::migration";
@@ -103,7 +105,6 @@ pub type MigrateToV2<T, I, PastPayouts> = VersionedMigration<
 
 pub(crate) mod v0 {
 	use super::*;
-	use frame_support::storage_alias;
 
 	/// A vote by a member on a candidate application.
 	#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
@@ -223,7 +224,7 @@ pub fn assert_internal_consistency<T: Config<I>, I: Instance + 'static>() {
 	// Check all payouts are valid data.
 	for p in Payouts::<T, I>::iter_keys() {
 		let k = Payouts::<T, I>::hashed_key_for(&p);
-		let v = frame_support::storage::unhashed::get_raw(&k[..]).expect("value is in map");
+		let v = unhashed::get_raw(&k[..]).expect("value is in map");
 		assert!(PayoutRecordFor::<T, I>::decode(&mut &v[..]).is_ok());
 	}
 
@@ -290,7 +291,7 @@ pub fn from_original<T: Config<I>, I: Instance + 'static>(
 				if let Some(member) = m {
 					member.index = 0;
 				} else {
-					frame_support::defensive!(
+					defensive!(
 						"Member somehow disappeared from storage after it was inserted"
 					);
 				}
@@ -299,7 +300,7 @@ pub fn from_original<T: Config<I>, I: Instance + 'static>(
 				if let Some(member) = m {
 					member.index = member_count;
 				} else {
-					frame_support::defensive!(
+					defensive!(
 						"Member somehow disappeared from storage after it was queried"
 					);
 				}
diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
index a5558ea58625a..d7218e45b6230 100644
--- a/substrate/frame/src/lib.rs
+++ b/substrate/frame/src/lib.rs
@@ -212,7 +212,8 @@ pub mod prelude {
 			OneSessionHandler, Randomness, RankedMembers, RankedMembersSwapHandler,
 			ReservableCurrency, StorageVersion, UncheckedOnRuntimeUpgrade,
 		},
-		PalletId,
+		PalletId, migrations::VersionedMigration,
+	};
 
 	/// Pallet prelude of `frame-system`.
 	#[doc(no_inline)]