From 44430fec41ca6fb4fdfae3e1478cd9af151e6b87 Mon Sep 17 00:00:00 2001 From: metricaez Date: Wed, 14 Feb 2024 20:03:25 -0300 Subject: [PATCH] fix: remove reachable dest --- pallets/withdraw-teleport/src/benchmarking.rs | 3 ++- pallets/withdraw-teleport/src/mock.rs | 7 ------- runtime/stout/src/xcm_config.rs | 6 ------ runtime/trappist/src/xcm_config.rs | 6 ------ 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/pallets/withdraw-teleport/src/benchmarking.rs b/pallets/withdraw-teleport/src/benchmarking.rs index f84c44fc..99c6b1c9 100644 --- a/pallets/withdraw-teleport/src/benchmarking.rs +++ b/pallets/withdraw-teleport/src/benchmarking.rs @@ -18,7 +18,8 @@ mod benchmarks { let fee_amount = 1_000; let asset: MultiAsset = (MultiLocation::new(0, Here), fee_amount.clone()).into(); let recipient = [0u8; 32]; - let versioned_dest: VersionedMultiLocation = T::ReachableDest::get() + let reachable_dest: Option = Some(Parachain(1000).into()); + let versioned_dest: VersionedMultiLocation = reachable_dest .ok_or(BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)))? .into(); let versioned_beneficiary: VersionedMultiLocation = diff --git a/pallets/withdraw-teleport/src/mock.rs b/pallets/withdraw-teleport/src/mock.rs index da3ae9df..80a7e959 100644 --- a/pallets/withdraw-teleport/src/mock.rs +++ b/pallets/withdraw-teleport/src/mock.rs @@ -207,11 +207,6 @@ parameter_types! { pub static AdvertisedXcmVersion: XcmVersion = 3; } -#[cfg(feature = "runtime-benchmarks")] -parameter_types! { - pub ReachableDest: Option = Some(Parachain(1000).into()); -} - impl pallet_xcm::Config for Test { type RuntimeEvent = RuntimeEvent; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin; @@ -235,8 +230,6 @@ impl pallet_xcm::Config for Test { type MaxRemoteLockConsumers = frame_support::traits::ConstU32<0>; type RemoteLockConsumerIdentifier = (); type WeightInfo = TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; type AdminOrigin = EnsureRoot; } diff --git a/runtime/stout/src/xcm_config.rs b/runtime/stout/src/xcm_config.rs index 93eec1e4..8dc3cdcb 100644 --- a/runtime/stout/src/xcm_config.rs +++ b/runtime/stout/src/xcm_config.rs @@ -306,10 +306,6 @@ pub type XcmRouter = ( XcmpQueue, ); -#[cfg(feature = "runtime-benchmarks")] -parameter_types! { - pub ReachableDest: Option = Some(Parent.into()); -} impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; @@ -333,8 +329,6 @@ impl pallet_xcm::Config for Runtime { type UniversalLocation = UniversalLocation; // TODO: pallet-xcm weights type WeightInfo = pallet_xcm::TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; type AdminOrigin = EnsureRoot; type MaxRemoteLockConsumers = ConstU32<0>; type RemoteLockConsumerIdentifier = (); diff --git a/runtime/trappist/src/xcm_config.rs b/runtime/trappist/src/xcm_config.rs index c3b5bd50..8fdd922a 100644 --- a/runtime/trappist/src/xcm_config.rs +++ b/runtime/trappist/src/xcm_config.rs @@ -378,10 +378,6 @@ pub type XcmRouter = ( XcmpQueue, ); -#[cfg(feature = "runtime-benchmarks")] -parameter_types! { - pub ReachableDest: Option = Some(Parent.into()); -} impl pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; @@ -410,8 +406,6 @@ impl pallet_xcm::Config for Runtime { type UniversalLocation = UniversalLocation; // TODO: pallet-xcm weights type WeightInfo = pallet_xcm::TestWeightInfo; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; type AdminOrigin = EnsureRoot; type MaxRemoteLockConsumers = ConstU32<0>; type RemoteLockConsumerIdentifier = ();