Migrate pallet-nft-fractionalization to umbrella crate

substrate/frame/nft-fractionalization/Cargo.toml

@@ -17,50 +17,35 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
+frame = { workspace = true, features = ["runtime"] }
 log = { workspace = true }
 pallet-assets = { workspace = true }
 pallet-nfts = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-benchmarking/std",
-	"frame-support/std",
-	"frame-system/std",
+	"frame/std",
 	"log/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
 	"pallet-nfts/std",
 	"scale-info/std",
-	"sp-core/std",
-	"sp-io/std",
-	"sp-runtime/std",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
+	"frame/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-nfts/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
+	"frame/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-nfts/try-runtime",
-	"sp-runtime/try-runtime",
 ]

substrate/frame/nft-fractionalization/src/benchmarking.rs

@@ -20,18 +20,14 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use super::*;
-use frame_benchmarking::v2::*;
-use frame_support::{
-	assert_ok,
-	traits::{
-		fungible::{Inspect as InspectFungible, Mutate as MutateFungible},
-		tokens::nonfungibles_v2::{Create, Mutate},
-		Get,
-	},
-};
-use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin as SystemOrigin};
+use frame::benchmarking::prelude::*;
+
+use frame::deps::frame_support::assert_ok;
+use fungible::{Inspect as InspectFungible, Mutate as MutateFungible};
+use nonfungibles_v2::{Create, Mutate};
+
+use frame_system::RawOrigin as SystemOrigin;
 use pallet_nfts::{CollectionConfig, CollectionSettings, ItemConfig, MintSettings};
-use sp_runtime::traits::StaticLookup;
 
 use crate::Pallet as NftFractionalization;
 

substrate/frame/nft-fractionalization/src/lib.rs

@@ -47,44 +47,32 @@ mod tests;
 
 pub mod weights;
 
+use frame::prelude::*;
 use frame_system::Config as SystemConfig;
 pub use pallet::*;
-pub use scale_info::Type;
 pub use types::*;
 pub use weights::WeightInfo;
 
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	use super::*;
 	use core::fmt::Display;
-	use frame_support::{
-		dispatch::DispatchResult,
-		ensure,
-		pallet_prelude::*,
-		sp_runtime::traits::{AccountIdConversion, StaticLookup},
-		traits::{
-			fungible::{
-				hold::Mutate as HoldMutateFungible, Inspect as InspectFungible,
-				Mutate as MutateFungible,
-			},
-			fungibles::{
-				metadata::{MetadataDeposit, Mutate as MutateMetadata},
-				Create, Destroy, Inspect, Mutate,
-			},
-			tokens::{
-				nonfungibles_v2::{Inspect as NonFungiblesInspect, Transfer},
-				AssetId, Balance as AssetBalance,
-				Fortitude::Polite,
-				Precision::{BestEffort, Exact},
-				Preservation::{Expendable, Preserve},
-			},
-		},
-		BoundedVec, PalletId,
+	use fungible::{
+		hold::Mutate as HoldMutateFungible, Inspect as InspectFungible, Mutate as MutateFungible,
+	};
+	use fungibles::{
+		metadata::{MetadataDeposit, Mutate as MutateMetadata},
+		Create, Destroy, Inspect, Mutate,
 	};
-	use frame_system::pallet_prelude::*;
+	use nonfungibles_v2::{Inspect as NonFungiblesInspect, Transfer};
 	use scale_info::prelude::{format, string::String};
-	use sp_runtime::traits::{One, Zero};
 
+	use tokens::{
+		AssetId, Balance as AssetBalance,
+		Fortitude::Polite,
+		Precision::{BestEffort, Exact},
+		Preservation::{Expendable, Preserve},
+	};
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 

substrate/frame/nft-fractionalization/src/mock.rs

@@ -20,19 +20,10 @@
 use super::*;
 use crate as pallet_nft_fractionalization;
 
-use frame_support::{
-	construct_runtime, derive_impl, parameter_types,
-	traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
-	BoundedVec, PalletId,
-};
-use frame_system::EnsureSigned;
+use frame::{deps::sp_runtime::MultiSignature, testing_prelude::*, traits::Verify};
 use pallet_nfts::PalletFeatures;
-use sp_runtime::{
-	traits::{IdentifyAccount, IdentityLookup, Verify},
-	BuildStorage, MultiSignature,
-};
 
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = MockBlock<Test>;
 type Signature = MultiSignature;
 type AccountPublic = <Signature as Verify>::Signer;
 type AccountId = <AccountPublic as IdentifyAccount>::AccountId;
@@ -150,10 +141,10 @@ impl Config for Test {
 }
 
 // Build genesis storage according to the mock runtime.
-pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
+pub(crate) fn new_test_ext() -> TestExternalities {
 	let t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 
-	let mut ext = sp_io::TestExternalities::new(t);
+	let mut ext = TestExternalities::new(t);
 	ext.execute_with(|| System::set_block_number(1));
 	ext
 }

substrate/frame/nft-fractionalization/src/tests.rs

@@ -18,15 +18,13 @@
 //! Tests for Nft fractionalization pallet.
 
 use crate::{mock::*, *};
-use frame_support::{
-	assert_noop, assert_ok,
-	traits::{
-		fungible::{hold::Inspect as InspectHold, Mutate as MutateFungible},
-		fungibles::{metadata::Inspect, InspectEnumerable},
-	},
-};
+
+use frame::{deps::sp_runtime::ModuleError, testing_prelude::*};
+use fungible::{hold::Inspect as InspectHold, Mutate as MutateFungible};
+use fungibles::{metadata::Inspect, InspectEnumerable};
+use TokenError::FundsUnavailable;
+
 use pallet_nfts::CollectionConfig;
-use sp_runtime::{DispatchError, ModuleError, TokenError::FundsUnavailable};
 
 fn assets() -> Vec<u32> {
 	let mut s: Vec<_> = <<Test as Config>::Assets>::asset_ids().collect();
@@ -93,7 +91,13 @@ fn fractionalize_should_work() {
 		assert_eq!(assets(), vec![asset_id]);
 		assert_eq!(Assets::balance(asset_id, account(2)), fractions);
 		assert_eq!(Balances::total_balance_on_hold(&account(1)), 2);
-		assert_eq!(String::from_utf8(Assets::name(0)).unwrap(), "Frac 0-0");
+		assert_eq!(
+			String::from_utf8(
+				<Assets as Inspect<<Test as frame_system::Config>::AccountId>>::name(0)
+			)
+			.unwrap(),
+			"Frac 0-0"
+		);
 		assert_eq!(String::from_utf8(Assets::symbol(0)).unwrap(), "FRAC");
 		assert_eq!(Nfts::owner(nft_collection_id, nft_id), Some(account(1)));
 		assert_noop!(

substrate/frame/nft-fractionalization/src/types.rs

@@ -19,9 +19,9 @@
 
 use super::*;
 use codec::{Decode, Encode, MaxEncodedLen};
-use frame_support::traits::{fungible::Inspect as FunInspect, fungibles::Inspect};
+use fungible::Inspect as FunInspect;
+use fungibles::Inspect;
 use scale_info::TypeInfo;
-use sp_runtime::traits::StaticLookup;
 
 pub type AssetIdOf<T> = <<T as Config>::Assets as Inspect<<T as SystemConfig>::AccountId>>::AssetId;
 pub type AssetBalanceOf<T> =