Migrate pallet-examples-split to use umbrella crate

prdoc/pr_7224.prdoc

@@ -0,0 +1,7 @@
+title: Migrate pallet-examples-split to use umbrella crate
+doc:
+- audience: Runtime Dev
+  description: Part of https://github.com/paritytech/polkadot-sdk/issues/6504
+crates:
+- name: polkadot-sdk-frame
+  bump: minor

substrate/frame/examples/split/Cargo.toml

@@ -20,32 +20,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"]}
 
-frame-support = { workspace = true }
-frame-system = { workspace = true }
-
-sp-io = { workspace = true }
-
-frame-benchmarking = { optional = true, workspace = true }
-
-[dev-dependencies]
-sp-core = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
-	"frame-benchmarking?/std",
-	"frame-support/std",
-	"frame-system/std",
 	"log/std",
 	"scale-info/std",
-	"sp-core/std",
-	"sp-io/std",
+	"frame/std",
 ]
-runtime-benchmarks = [
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
+
+try-runtime = [
+	"frame/try-runtime",
 ]
-try-runtime = ["frame-support/try-runtime", "frame-system/try-runtime"]

substrate/frame/examples/split/src/benchmarking.rs

@@ -23,8 +23,7 @@ use super::*;
 
 #[allow(unused)]
 use crate::Pallet as Template;
-use frame_benchmarking::v2::*;
-use frame_system::RawOrigin;
+use frame::benchmarking::prelude::*;
 
 #[benchmarks]
 mod benchmarks {

substrate/frame/examples/split/src/events.rs

@@ -15,17 +15,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use frame_support::pallet_macros::*;
 
 /// A [`pallet_section`] that defines the events for a pallet.
 /// This can later be imported into the pallet using [`import_section`].
 #[pallet_section]
 mod events {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
 		/// Event documentation should end with an array that provides descriptive names for event
 		/// parameters. [something, who]
 		SomethingStored { something: u32, who: T::AccountId },
 	}
 }

substrate/frame/examples/split/src/lib.rs

@@ -26,7 +26,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
 
 #[cfg(test)]
 mod mock;
@@ -34,23 +34,21 @@
 #[cfg(test)]
 mod tests;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 mod events;
 
 pub mod weights;
 pub use weights::*;
 
-use frame_support::pallet_macros::*;
+use frame::prelude::*;
 
 /// Imports a [`pallet_section`] defined at [`events::events`].
 /// This brings the events defined in that section into the pallet's namespace.
 #[import_section(events::events)]
-#[frame_support::pallet]
+#[frame::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
-	use frame_system::pallet_prelude::*;
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);

substrate/frame/examples/split/src/mock.rs

@@ -16,12 +16,12 @@
 // limitations under the License.
 
 use crate as pallet_template;
-use frame_support::{derive_impl, sp_runtime::BuildStorage};
+use frame::testing_prelude::*;
 
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
-frame_support::construct_runtime!(
+construct_runtime!(
 	pub enum Test
 	{
 		System: frame_system,
@@ -42,6 +42,6 @@ impl pallet_template::Config for Test {
 }
 
 // Build genesis storage according to the mock runtime.
-pub fn new_test_ext() -> sp_io::TestExternalities {
+pub fn new_test_ext() -> TestState {
 	frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
 }

substrate/frame/examples/split/src/tests.rs

@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use crate::{mock::*, Error, Event, Something};
-use frame_support::{assert_noop, assert_ok};
+use frame::testing_prelude::*;
 
 #[test]
 fn it_works_for_default_value() {

substrate/frame/src/lib.rs

@@ -230,10 +230,10 @@ pub mod prelude {
 
 	/// Runtime traits
 	#[doc(no_inline)]
-	pub use sp_runtime::traits::{
+	pub use sp_runtime::{traits::{
 		BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, ReduceBy,
 		ReplaceWithDefault, SaturatedConversion, Saturating, StaticLookup, TrailingZeroInput,
-	};
+	}, BuildStorage};
 	/// Other error/result types for runtime
 	#[doc(no_inline)]
 	pub use sp_runtime::{