remove experimental feature

paritytech · Jan 23, 2025 · 5f3515c · 5f3515c
1 parent 5a03642
commit 5f3515c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-frame = { workspace = true, features = ["runtime"]}
+frame = { workspace = true, features = ["runtime", "try-runtime"]}
 environmental = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }

diff --git a/substrate/frame/message-queue/src/lib.rs b/substrate/frame/message-queue/src/lib.rs
@@ -215,6 +215,9 @@ use scale_info::TypeInfo;
 
 pub use weights::WeightInfo;
 
+#[cfg(feature = "try-runtime")]
+use frame::try_runtime::TryRuntimeError;
+
 /// Type for identifying a page.
 type PageIndex = u32;
 
@@ -1611,7 +1614,7 @@ pub(crate) fn with_service_mutex<F: FnOnce() -> R, R>(f: F) -> Result<R, ()> {
 		let hold = token::with(|t| t.take()).ok_or(()).defensive()?.ok_or(())?;
 
 		// Put the token back when we're done.
-		defer! {
+		frame::deps::sp_core::defer! {
 			token::with(|t| {
 				*t = Some(hold);
 			});

diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
@@ -239,9 +239,9 @@ pub mod prelude {
 	/// Runtime traits
 	#[doc(no_inline)]
 	pub use sp_runtime::traits::{
-		BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, One, ReduceBy,
+		BlockNumberProvider, Bounded, Convert, DispatchInfoOf, Dispatchable, ReduceBy,
 		ReplaceWithDefault, SaturatedConversion, Saturating, StaticLookup,
-		TrailingZeroInput, Zero,
+		TrailingZeroInput,
 	};
 
 	/// Bounded storage related types.
@@ -334,7 +334,7 @@ pub mod testing_prelude {
 	/// Other helper macros from `frame_support` that help with asserting in tests.
 	pub use frame_support::{
 		assert_err, assert_err_ignore_postinfo, assert_error_encoded_size, assert_noop, assert_ok,
-		assert_storage_noop, ensure, hypothetically, storage_alias,
+		assert_storage_noop, ensure, hypothetically, storage_alias, StorageNoopGuard,
 	};
 
 	pub use frame_system::{self, mocking::*, RunToBlockHooks};
@@ -543,6 +543,7 @@ pub mod traits {
 /// This is already part of the [`prelude`].
 pub mod arithmetic {
 	pub use sp_arithmetic::{traits::*, *};
+	pub use sp_runtime::traits::{Zero, One};
 }
 
 /// All derive macros used in frame.