git.delta.rocks / unique-network / refs/commits / d0b6ad7ebb12

29	Runtime, RuntimeEvent, RelayChainBlockNumberProvider,29	Runtime, RuntimeEvent, RelayChainBlockNumberProvider,
30	runtime_common::config::{30	runtime_common::config::{
31		xcm::{31		xcm::{
32			SelfLocation, Weigher, XcmConfig, UniversalLocation,32			SelfLocation, Weigher, XcmExecutorConfig, UniversalLocation,
33			xcm_assets::{CurrencyIdConvert},33			xcm_assets::{CurrencyIdConvert},
34		},34		},
35		pallets::TreasuryAccountId,35		pallets::TreasuryAccountId,
138	type CurrencyIdConvert = CurrencyIdConvert;138	type CurrencyIdConvert = CurrencyIdConvert;
139	type AccountIdToMultiLocation = AccountIdToMultiLocation;139	type AccountIdToMultiLocation = AccountIdToMultiLocation;
140	type SelfLocation = SelfLocation;140	type SelfLocation = SelfLocation;
141	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;141	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
142	type Weigher = Weigher;142	type Weigher = Weigher;
143	type BaseXcmWeight = BaseXcmWeight;143	type BaseXcmWeight = BaseXcmWeight;
144	type MaxAssetsForTransfer = MaxAssetsForTransfer;144	type MaxAssetsForTransfer = MaxAssetsForTransfer;

--- a/runtime/common/config/xcm/mod.rs
+++ b/runtime/common/config/xcm/mod.rs
@@ -28,7 +28,7 @@
 	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
 	SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,
 };
-use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute};
+use xcm_executor::{XcmExecutor, traits::ShouldExecute};
 use sp_std::{marker::PhantomData, vec::Vec};
 use crate::{
 	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,
@@ -182,8 +182,8 @@
 
 pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 
-pub struct XcmConfig<T>(PhantomData<T>);
-impl<T> Config for XcmConfig<T>
+pub struct XcmExecutorConfig<T>(PhantomData<T>);
+impl<T> xcm_executor::Config for XcmExecutorConfig<T>
 where
 	T: pallet_configuration::Config,
 {
@@ -227,7 +227,7 @@
 	type XcmRouter = XcmRouter;
 	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type XcmExecuteFilter = Everything;
-	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
 	type XcmTeleportFilter = Everything;
 	type XcmReserveTransferFilter = Everything;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
@@ -248,13 +248,13 @@
 
 impl cumulus_pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
 }
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = ();
 	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
@@ -265,6 +265,6 @@
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
 	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
 }