fixes

Author: Szegoo

runtime/common/src/paras_registrar.rs

@@ -103,7 +103,7 @@ pub mod pallet {
 		/// same type, we just can't express that to the Rust type system without writing a `where`
 		/// clause everywhere.
 		type RuntimeOrigin: From<<Self as frame_system::Config>::RuntimeOrigin>
-			+ Into<result::Result<RuntimeOrigin, <Self as Config>::RuntimeOrigin>>;
+			+ Into<result::Result<Origin, <Self as Config>::RuntimeOrigin>>;
 
 		/// The system's currency for parathread payment.
 		type Currency: ReservableCurrency<Self::AccountId>;

runtime/parachains/src/hrmp/benchmarking.rs

@@ -64,7 +64,7 @@ fn establish_para_connection<T: Config>(
 	from: u32,
 	to: u32,
 	until: ParachainSetupStep,
-) -> [(ParaId, crate::Origin); 2]
+) -> [(ParaId, crate::RuntimeOrigin); 2]
 where
 	<T as frame_system::Config>::RuntimeOrigin: From<crate::RuntimeOrigin>,
 {

runtime/parachains/src/origin.rs

@@ -26,10 +26,10 @@ pub use pallet::*;
 /// Returns `Ok` with the parachain ID that effected the extrinsic or an `Err` otherwise.
 pub fn ensure_parachain<OuterOrigin>(o: OuterOrigin) -> result::Result<ParaId, BadOrigin>
 where
-	OuterOrigin: Into<result::Result<RuntimeOrigin, OuterOrigin>>,
+	OuterOrigin: Into<result::Result<Origin, OuterOrigin>>,
 {
 	match o.into() {
-		Ok(Origin::Parachain(id)) => Ok(id),
+		Ok(RuntimeOrigin::Parachain(id)) => Ok(id),
 		_ => Err(BadOrigin),
 	}
 }

xcm/pallet-xcm-benchmarks/src/generic/mock.rs

@@ -168,7 +168,7 @@ where
 	fn convert_origin(
 		_origin: impl Into<MultiLocation>,
 		_kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		Ok(RuntimeOrigin::signed(
 			<RuntimeOrigin as OriginTrait>::AccountId::decode(&mut TrailingZeroInput::zeroes())
 				.expect("infinite length input; no invalid inputs for type; qed"),

xcm/pallet-xcm/src/lib.rs

@@ -110,7 +110,7 @@ pub mod pallet {
 		type LocationInverter: InvertLocation;
 
 		/// The outer `Origin` type.
-		type RuntimeOrigin: From<RuntimeOrigin> + From<<Self as SysConfig>::RuntimeOrigin>;
+		type RuntimeOrigin: From<Origin> + From<<Self as SysConfig>::RuntimeOrigin>;
 
 		/// The outer `Call` type.
 		type RuntimeCall: Parameter
@@ -1477,10 +1477,10 @@ pub mod pallet {
 /// Returns `Ok` with the location of the XCM sender or an `Err` otherwise.
 pub fn ensure_xcm<OuterOrigin>(o: OuterOrigin) -> Result<MultiLocation, BadOrigin>
 where
-	OuterOrigin: Into<Result<RuntimeOrigin, OuterOrigin>>,
+	OuterOrigin: Into<Result<Origin, OuterOrigin>>,
 {
 	match o.into() {
-		Ok(Origin::Xcm(location)) => Ok(location),
+		Ok(RuntimeOrigin::Xcm(location)) => Ok(location),
 		_ => Err(BadOrigin),
 	}
 }
@@ -1490,10 +1490,10 @@ where
 /// Returns `Ok` with the location of the responder or an `Err` otherwise.
 pub fn ensure_response<OuterOrigin>(o: OuterOrigin) -> Result<MultiLocation, BadOrigin>
 where
-	OuterOrigin: Into<Result<RuntimeOrigin, OuterOrigin>>,
+	OuterOrigin: Into<Result<Origin, OuterOrigin>>,
 {
 	match o.into() {
-		Ok(Origin::Response(location)) => Ok(location),
+		Ok(RuntimeOrigin::Response(location)) => Ok(location),
 		_ => Err(BadOrigin),
 	}
 }
@@ -1515,36 +1515,35 @@ impl<Prefix: Get<MultiLocation>, Body: Get<BodyId>> Contains<MultiLocation>
 /// `EnsureOrigin` implementation succeeding with a `MultiLocation` value to recognize and filter the
 /// `Origin::Xcm` item.
 pub struct EnsureXcm<F>(PhantomData<F>);
-impl<O: OriginTrait + From<RuntimeOrigin>, F: Contains<MultiLocation>> EnsureOrigin<O>
-	for EnsureXcm<F>
+impl<O: OriginTrait + From<Origin>, F: Contains<MultiLocation>> EnsureOrigin<O> for EnsureXcm<F>
 where
-	O::PalletsOrigin: From<RuntimeOrigin> + TryInto<RuntimeOrigin, Error = O::PalletsOrigin>,
+	O::PalletsOrigin: From<Origin> + TryInto<Origin, Error = O::PalletsOrigin>,
 {
 	type Success = MultiLocation;
 
 	fn try_origin(outer: O) -> Result<Self::Success, O> {
 		outer.try_with_caller(|caller| {
 			caller.try_into().and_then(|o| match o {
 				Origin::Xcm(location) if F::contains(&location) => Ok(location),
-				Origin::Xcm(location) => Err(Origin::Xcm(location).into()),
+				Origin::Xcm(location) => Err(RuntimeOrigin::Xcm(location).into()),
 				o => Err(o.into()),
 			})
 		})
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
 	fn try_successful_origin() -> Result<O, ()> {
-		Ok(O::from(Origin::Xcm(Here.into())))
+		Ok(O::from(RuntimeOrigin::Xcm(Here.into())))
 	}
 }
 
 /// `EnsureOrigin` implementation succeeding with a `MultiLocation` value to recognize and filter
 /// the `Origin::Response` item.
 pub struct EnsureResponse<F>(PhantomData<F>);
-impl<O: OriginTrait + From<RuntimeOrigin>, F: Contains<MultiLocation>> EnsureOrigin<O>
+impl<O: OriginTrait + From<Origin>, F: Contains<MultiLocation>> EnsureOrigin<O>
 	for EnsureResponse<F>
 where
-	O::PalletsOrigin: From<RuntimeOrigin> + TryInto<RuntimeOrigin, Error = O::PalletsOrigin>,
+	O::PalletsOrigin: From<Origin> + TryInto<Origin, Error = O::PalletsOrigin>,
 {
 	type Success = MultiLocation;
 
@@ -1559,7 +1558,7 @@ where
 
 	#[cfg(feature = "runtime-benchmarks")]
 	fn try_successful_origin() -> Result<O, ()> {
-		Ok(O::from(Origin::Response(Here.into())))
+		Ok(O::from(RuntimeOrigin::Response(Here.into())))
 	}
 }
 
@@ -1572,7 +1571,7 @@ impl<RuntimeOrigin: From<crate::RuntimeOrigin>> ConvertOrigin<RuntimeOrigin>
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		match kind {
 			OriginKind::Xcm => Ok(crate::Origin::Xcm(origin).into()),

xcm/xcm-builder/src/origin_conversion.rs

@@ -25,17 +25,19 @@ use xcm_executor::traits::{Convert, ConvertOrigin};
 
 /// Sovereign accounts use the system's `Signed` origin with an account ID derived from the `LocationConverter`.
 pub struct SovereignSignedViaLocation<LocationConverter, RuntimeOrigin>(
-	PhantomData<(LocationConverter, Origin)>,
+	PhantomData<(LocationConverter, RuntimeOrigin)>,
 );
-impl<LocationConverter: Convert<MultiLocation, Origin::AccountId>, RuntimeOrigin: OriginTrait>
-	ConvertOrigin<RuntimeOrigin> for SovereignSignedViaLocation<LocationConverter, RuntimeOrigin>
+impl<
+		LocationConverter: Convert<MultiLocation, RuntimeOrigin::AccountId>,
+		RuntimeOrigin: OriginTrait,
+	> ConvertOrigin<RuntimeOrigin> for SovereignSignedViaLocation<LocationConverter, RuntimeOrigin>
 where
-	Origin::AccountId: Clone,
+	RuntimeOrigin::AccountId: Clone,
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(
 			target: "xcm::origin_conversion",
@@ -56,7 +58,7 @@ impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin> for ParentAsSuperu
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(target: "xcm::origin_conversion", "ParentAsSuperuser origin: {:?}, kind: {:?}", origin, kind);
 		if kind == OriginKind::Superuser && origin.contains_parents_only(1) {
@@ -67,14 +69,16 @@ impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin> for ParentAsSuperu
 	}
 }
 
-pub struct ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>(PhantomData<(ParaId, Origin)>);
+pub struct ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>(
+	PhantomData<(ParaId, RuntimeOrigin)>,
+);
 impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
 	for ChildSystemParachainAsSuperuser<ParaId, RuntimeOrigin>
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(target: "xcm::origin_conversion", "ChildSystemParachainAsSuperuser origin: {:?}, kind: {:?}", origin, kind);
 		match (kind, origin) {
@@ -87,14 +91,16 @@ impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<Run
 	}
 }
 
-pub struct SiblingSystemParachainAsSuperuser<ParaId, RuntimeOrigin>(PhantomData<(ParaId, Origin)>);
+pub struct SiblingSystemParachainAsSuperuser<ParaId, RuntimeOrigin>(
+	PhantomData<(ParaId, RuntimeOrigin)>,
+);
 impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
 	for SiblingSystemParachainAsSuperuser<ParaId, RuntimeOrigin>
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(
 			target: "xcm::origin_conversion",
@@ -112,15 +118,15 @@ impl<ParaId: IsSystem + From<u32>, RuntimeOrigin: OriginTrait> ConvertOrigin<Run
 }
 
 pub struct ChildParachainAsNative<ParachainOrigin, RuntimeOrigin>(
-	PhantomData<(ParachainOrigin, Origin)>,
+	PhantomData<(ParachainOrigin, RuntimeOrigin)>,
 );
 impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOrigin<RuntimeOrigin>
 	for ChildParachainAsNative<ParachainOrigin, RuntimeOrigin>
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(target: "xcm::origin_conversion", "ChildParachainAsNative origin: {:?}, kind: {:?}", origin, kind);
 		match (kind, origin) {
@@ -134,15 +140,15 @@ impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOr
 }
 
 pub struct SiblingParachainAsNative<ParachainOrigin, RuntimeOrigin>(
-	PhantomData<(ParachainOrigin, Origin)>,
+	PhantomData<(ParachainOrigin, RuntimeOrigin)>,
 );
 impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOrigin<RuntimeOrigin>
 	for SiblingParachainAsNative<ParachainOrigin, RuntimeOrigin>
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(
 			target: "xcm::origin_conversion",
@@ -160,14 +166,16 @@ impl<ParachainOrigin: From<u32>, RuntimeOrigin: From<ParachainOrigin>> ConvertOr
 }
 
 // Our Relay-chain has a native origin given by the `Get`ter.
-pub struct RelayChainAsNative<RelayOrigin, RuntimeOrigin>(PhantomData<(RelayOrigin, Origin)>);
+pub struct RelayChainAsNative<RelayOrigin, RuntimeOrigin>(
+	PhantomData<(RelayOrigin, RuntimeOrigin)>,
+);
 impl<RelayOrigin: Get<RuntimeOrigin>, RuntimeOrigin> ConvertOrigin<RuntimeOrigin>
 	for RelayChainAsNative<RelayOrigin, RuntimeOrigin>
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(target: "xcm::origin_conversion", "RelayChainAsNative origin: {:?}, kind: {:?}", origin, kind);
 		if kind == OriginKind::Native && origin.contains_parents_only(1) {
@@ -178,16 +186,16 @@ impl<RelayOrigin: Get<RuntimeOrigin>, RuntimeOrigin> ConvertOrigin<RuntimeOrigin
 	}
 }
 
-pub struct SignedAccountId32AsNative<Network, RuntimeOrigin>(PhantomData<(Network, Origin)>);
+pub struct SignedAccountId32AsNative<Network, RuntimeOrigin>(PhantomData<(Network, RuntimeOrigin)>);
 impl<Network: Get<NetworkId>, RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
 	for SignedAccountId32AsNative<Network, RuntimeOrigin>
 where
-	Origin::AccountId: From<[u8; 32]>,
+	RuntimeOrigin::AccountId: From<[u8; 32]>,
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(
 			target: "xcm::origin_conversion",
@@ -205,16 +213,18 @@ where
 	}
 }
 
-pub struct SignedAccountKey20AsNative<Network, RuntimeOrigin>(PhantomData<(Network, Origin)>);
+pub struct SignedAccountKey20AsNative<Network, RuntimeOrigin>(
+	PhantomData<(Network, RuntimeOrigin)>,
+);
 impl<Network: Get<NetworkId>, RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
 	for SignedAccountKey20AsNative<Network, RuntimeOrigin>
 where
-	Origin::AccountId: From<[u8; 20]>,
+	RuntimeOrigin::AccountId: From<[u8; 20]>,
 {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation> {
+	) -> Result<Origin, MultiLocation> {
 		let origin = origin.into();
 		log::trace!(
 			target: "xcm::origin_conversion",
@@ -233,14 +243,14 @@ where
 }
 
 /// `EnsureOrigin` barrier to convert from dispatch origin to XCM origin, if one exists.
-pub struct EnsureXcmOrigin<RuntimeOrigin, Conversion>(PhantomData<(Origin, Conversion)>);
+pub struct EnsureXcmOrigin<RuntimeOrigin, Conversion>(PhantomData<(RuntimeOrigin, Conversion)>);
 impl<RuntimeOrigin: OriginTrait + Clone, Conversion: Convert<RuntimeOrigin, MultiLocation>>
 	EnsureOrigin<RuntimeOrigin> for EnsureXcmOrigin<RuntimeOrigin, Conversion>
 where
-	Origin::PalletsOrigin: PartialEq,
+	RuntimeOrigin::PalletsOrigin: PartialEq,
 {
 	type Success = MultiLocation;
-	fn try_origin(o: Origin) -> Result<Self::Success, RuntimeOrigin> {
+	fn try_origin(o: RuntimeOrigin) -> Result<Self::Success, RuntimeOrigin> {
 		let o = match Conversion::convert(o) {
 			Ok(location) => return Ok(location),
 			Err(o) => o,
@@ -255,7 +265,7 @@ where
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn try_successful_origin() -> Result<RuntimeOrigin, ()> {
+	fn try_successful_origin() -> Result<Origin, ()> {
 		Ok(RuntimeOrigin::root())
 	}
 }
@@ -265,15 +275,15 @@ where
 /// Typically used when configuring `pallet-xcm` for allowing normal accounts to dispatch an XCM from an `AccountId32`
 /// origin.
 pub struct SignedToAccountId32<RuntimeOrigin, AccountId, Network>(
-	PhantomData<(Origin, AccountId, Network)>,
+	PhantomData<(RuntimeOrigin, AccountId, Network)>,
 );
 impl<RuntimeOrigin: OriginTrait + Clone, AccountId: Into<[u8; 32]>, Network: Get<NetworkId>>
 	Convert<RuntimeOrigin, MultiLocation> for SignedToAccountId32<RuntimeOrigin, AccountId, Network>
 where
-	Origin::PalletsOrigin: From<SystemRawOrigin<AccountId>>
-		+ TryInto<SystemRawOrigin<AccountId>, Error = Origin::PalletsOrigin>,
+	RuntimeOrigin::PalletsOrigin: From<SystemRawOrigin<AccountId>>
+		+ TryInto<SystemRawOrigin<AccountId>, Error = RuntimeOrigin::PalletsOrigin>,
 {
-	fn convert(o: Origin) -> Result<MultiLocation, RuntimeOrigin> {
+	fn convert(o: RuntimeOrigin) -> Result<MultiLocation, RuntimeOrigin> {
 		o.try_with_caller(|caller| match caller.try_into() {
 			Ok(SystemRawOrigin::Signed(who)) =>
 				Ok(Junction::AccountId32 { network: Network::get(), id: who.into() }.into()),
@@ -288,13 +298,16 @@ where
 ///
 /// Typically used when configuring `pallet-xcm` for allowing a collective's Origin to dispatch an XCM from a
 /// `Plurality` origin.
-pub struct BackingToPlurality<RuntimeOrigin, COrigin, Body>(PhantomData<(Origin, COrigin, Body)>);
+pub struct BackingToPlurality<RuntimeOrigin, COrigin, Body>(
+	PhantomData<(RuntimeOrigin, COrigin, Body)>,
+);
 impl<RuntimeOrigin: OriginTrait + Clone, COrigin: GetBacking, Body: Get<BodyId>>
 	Convert<RuntimeOrigin, MultiLocation> for BackingToPlurality<RuntimeOrigin, COrigin, Body>
 where
-	Origin::PalletsOrigin: From<COrigin> + TryInto<COrigin, Error = Origin::PalletsOrigin>,
+	RuntimeOrigin::PalletsOrigin:
+		From<COrigin> + TryInto<COrigin, Error = RuntimeOrigin::PalletsOrigin>,
 {
-	fn convert(o: Origin) -> Result<MultiLocation, RuntimeOrigin> {
+	fn convert(o: RuntimeOrigin) -> Result<MultiLocation, RuntimeOrigin> {
 		o.try_with_caller(|caller| match caller.try_into() {
 			Ok(co) => match co.get_backing() {
 				Some(backing) => Ok(Junction::Plurality {

xcm/xcm-executor/src/traits/conversion.rs

@@ -178,7 +178,7 @@ pub trait ConvertOrigin<RuntimeOrigin> {
 	fn convert_origin(
 		origin: impl Into<MultiLocation>,
 		kind: OriginKind,
-	) -> Result<RuntimeOrigin, MultiLocation>;
+	) -> Result<Origin, MultiLocation>;
 }
 
 #[impl_trait_for_tuples::impl_for_tuples(30)]