contracts: apply suggested pr changes

frame/contracts/src/lib.rs

@@ -126,7 +126,7 @@ use pallet_contracts_primitives::{
 };
 use scale_info::TypeInfo;
 use smallvec::Array;
-use sp_runtime::traits::{BadOrigin, Convert, Hash, Saturating, StaticLookup};
+use sp_runtime::traits::{Convert, Hash, Saturating, StaticLookup};
 use sp_std::{fmt::Debug, marker::PhantomData, prelude::*};
 
 pub use crate::{
@@ -569,7 +569,11 @@ pub mod pallet {
 			data: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			let gas_limit: Weight = gas_limit.into();
-			let origin = contract_ensure_signed_or_root(origin)?;
+			// Ensure that the origin is either a signed extrinsic or root.
+			let origin = match ensure_signed_or_root(origin)? {
+				Some(t) => Caller::Signed(t),
+				None => Caller::Root,
+			};
 			let dest = T::Lookup::lookup(dest)?;
 			let common = CommonInput {
 				value,
@@ -908,17 +912,6 @@ pub mod pallet {
 		StorageValue<_, DeletionQueueManager<T>, ValueQuery>;
 }
 
-/// Helper function to ensure that the origin is either a signed extrinsic or root.
-/// Returns a `Caller` if it is one of those, or an `Err` otherwise.
-fn contract_ensure_signed_or_root<T: Config>(
-	origin: T::RuntimeOrigin,
-) -> Result<Caller<T>, BadOrigin> {
-	match ensure_signed_or_root(origin)? {
-		Some(t) => Ok(Caller::Signed(t)),
-		None => Ok(Caller::Root),
-	}
-}
-
 /// The type of callers supported by the contracts pallet.
 #[derive(Clone, Encode, Decode, PartialEq, TypeInfo, RuntimeDebugNoBound)]
 pub enum Caller<T: Config> {

frame/contracts/src/storage/meter.rs

@@ -340,7 +340,10 @@ where
 		return match origin {
 			Caller::Root => {
 				match limit {
-					// If the limit is specified, that the root's limit.
+					// We don't have a way to check the root's limit as there isn't an account
+					// associated with it. Therefore, whatever the specified limit is, that will be
+					// the root's limit. Following this criteria, when the caller is root we need
+					// the limit parameter to be specified.
 					Some(l) => Ok(Self { limit: l, ..Default::default() }),
 					None => Err(<Error<T>>::StorageDepositLimitRequired.into()),
 				}