fix: remove reachable dest

paritytech · Feb 14, 2024 · 44430fe · 44430fe
1 parent 628f510
commit 44430fe
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git 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<MultiLocation> = 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
@@ -207,11 +207,6 @@ parameter_types! {
 	pub static AdvertisedXcmVersion: XcmVersion = 3;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parachain(1000).into());
-}
-
 impl pallet_xcm::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
@@ -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<AccountId>;
 }
 

diff --git 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<MultiLocation> = 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<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();

diff --git 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<MultiLocation> = 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<AccountId>;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();