Use EnsureRoot directly

bridges/snowbridge/pallets/system/src/lib.rs

@@ -84,7 +84,6 @@ use sp_std::prelude::*;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 
-#[cfg(feature = "runtime-benchmarks")]
 use frame_support::traits::OriginTrait;
 
 pub use pallet::*;
@@ -135,28 +134,6 @@ where
 	No,
 }
 
-pub struct EnsureOriginWithControlFlag<T, F, A>(core::marker::PhantomData<(T, F, A)>);
-impl<T: Config, F: Get<bool>, A: Get<AccountIdOf<T>>>
-	EnsureOrigin<<T as frame_system::Config>::RuntimeOrigin> for EnsureOriginWithControlFlag<T, F, A>
-{
-	type Success = AccountIdOf<T>;
-	fn try_origin(o: T::RuntimeOrigin) -> Result<Self::Success, T::RuntimeOrigin> {
-		o.into().and_then(|o| match o {
-			RawOrigin::Root => Ok(A::get()),
-			RawOrigin::Signed(t) if F::get() => Ok(t),
-			r => Err(T::RuntimeOrigin::from(r)),
-		})
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	fn try_successful_origin() -> Result<T::RuntimeOrigin, ()> {
-		let zero_account_id =
-			T::AccountId::decode(&mut sp_runtime::traits::TrailingZeroInput::zeroes())
-				.expect("infinite length input; no invalid inputs for type; qed");
-		Ok(RawOrigin::Signed(zero_account_id).into())
-	}
-}
-
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::dispatch::PostDispatchInfo;
@@ -206,7 +183,7 @@ pub mod pallet {
 		#[cfg(feature = "runtime-benchmarks")]
 		type Helper: BenchmarkHelper<Self::RuntimeOrigin>;
 
-		type RegisterTokenOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = AccountIdOf<Self>>;
+		type RegisterTokenOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 	}
 
 	#[pallet::event]
@@ -648,18 +625,23 @@ pub mod pallet {
 			location: Box<VersionedLocation>,
 			metadata: AssetMetadata,
 		) -> DispatchResultWithPostInfo {
-			let who = T::RegisterTokenOrigin::ensure_origin(origin)?;
+			T::RegisterTokenOrigin::ensure_origin_or_root(origin.clone())?;
+
+			let pays_fee = match origin.as_system_ref() {
+				Some(&RawOrigin::Root) => Ok((PaysFee::<T>::No, Pays::No)),
+				Some(&RawOrigin::Signed(ref who)) =>
+					Ok((PaysFee::<T>::Yes(who.clone()), Pays::Yes)),
+				_ => Err(BadOrigin),
+			}?;
 
 			let location: Location =
 				(*location).try_into().map_err(|_| Error::<T>::UnsupportedLocationVersion)?;
 
-			let pays_fee = PaysFee::<T>::Yes(who);
-
-			Self::do_register_token(&location, metadata, pays_fee)?;
+			Self::do_register_token(&location, metadata, pays_fee.0)?;
 
 			Ok(PostDispatchInfo {
 				actual_weight: Some(T::WeightInfo::register_token()),
-				pays_fee: Pays::No,
+				pays_fee: pays_fee.1,
 			})
 		}
 	}

bridges/snowbridge/pallets/system/src/mock.rs

@@ -7,6 +7,7 @@ use frame_support::{
 	weights::IdentityFee,
 	PalletId,
 };
+use frame_system::EnsureRoot;
 use sp_core::H256;
 use xcm_executor::traits::ConvertLocation;
 
@@ -22,7 +23,6 @@ use xcm::prelude::*;
 
 #[cfg(feature = "runtime-benchmarks")]
 use crate::BenchmarkHelper;
-use crate::EnsureOriginWithControlFlag;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 type Balance = u128;
@@ -214,8 +214,7 @@ impl crate::Config for Test {
 	type EthereumNetwork = EthereumNetwork;
 	#[cfg(feature = "runtime-benchmarks")]
 	type Helper = ();
-	type RegisterTokenOrigin =
-		EnsureOriginWithControlFlag<Test, EnableRegisterToken, TreasuryAccount>;
+	type RegisterTokenOrigin = EnsureRoot<AccountId>;
 }
 
 // Build genesis storage according to the mock runtime.

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_ethereum_config.rs

@@ -36,8 +36,8 @@ use crate::xcm_config::RelayNetwork;
 #[cfg(feature = "runtime-benchmarks")]
 use benchmark_helpers::DoNothingRouter;
 use frame_support::{parameter_types, weights::ConstantMultiplier};
+use frame_system::EnsureRoot;
 use pallet_xcm::EnsureXcm;
-use snowbridge_pallet_system::EnsureOriginWithControlFlag;
 use sp_runtime::{
 	traits::{ConstU32, ConstU8, Keccak256},
 	FixedU128,
@@ -56,7 +56,6 @@ pub type SnowbridgeExporter = EthereumBlobExporter<
 // Ethereum Bridge
 parameter_types! {
 	pub storage EthereumGatewayAddress: H160 = H160(hex_literal::hex!("EDa338E4dC46038493b885327842fD3E301CaB39"));
-	pub storage EnableRegisterToken: bool = false;
 }
 
 parameter_types! {
@@ -192,8 +191,7 @@ impl snowbridge_pallet_system::Config for Runtime {
 	type InboundDeliveryCost = EthereumInboundQueue;
 	type UniversalLocation = UniversalLocation;
 	type EthereumNetwork = EthereumNetwork;
-	type RegisterTokenOrigin =
-		EnsureOriginWithControlFlag<Runtime, EnableRegisterToken, TreasuryAccount>;
+	type RegisterTokenOrigin = EnsureRoot<Self::AccountId>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_ethereum_config.rs

@@ -37,8 +37,8 @@ use crate::xcm_config::RelayNetwork;
 #[cfg(feature = "runtime-benchmarks")]
 use benchmark_helpers::DoNothingRouter;
 use frame_support::{parameter_types, weights::ConstantMultiplier};
+use frame_system::EnsureRoot;
 use pallet_xcm::EnsureXcm;
-use snowbridge_pallet_system::EnsureOriginWithControlFlag;
 use sp_runtime::{
 	traits::{ConstU32, ConstU8, Keccak256},
 	FixedU128,
@@ -59,7 +59,6 @@ pub type SnowbridgeExporter = EthereumBlobExporter<
 // Ethereum Bridge
 parameter_types! {
 	pub storage EthereumGatewayAddress: H160 = H160(hex_literal::hex!("EDa338E4dC46038493b885327842fD3E301CaB39"));
-	pub storage EnableRegisterToken: bool = false;
 }
 
 parameter_types! {
@@ -192,8 +191,7 @@ impl snowbridge_pallet_system::Config for Runtime {
 	type InboundDeliveryCost = EthereumInboundQueue;
 	type UniversalLocation = UniversalLocation;
 	type EthereumNetwork = EthereumNetwork;
-	type RegisterTokenOrigin =
-		EnsureOriginWithControlFlag<Runtime, EnableRegisterToken, TreasuryAccount>;
+	type RegisterTokenOrigin = EnsureRoot<Self::AccountId>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]