fix: remove unused imports and clean up lint warnings in xcm_config.rs and xcm_queue.rs

Author: mattheworris

runtime/frequency/src/xcm_config.rs

@@ -1,26 +1,31 @@
 use crate::{
-	AccountId, AllPalletsWithSystem, Balances, CumulusXcm, ParachainInfo, ParachainSystem,
-	PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, XcmpQueue,
+	AccountId, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem, PolkadotXcm,
+	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, XcmpQueue,
 };
+// TODO: To fix lint these were removed. Determine if the following imports are necessary:
+//       CulumusXcm
 
 use staging_xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
 	DenyRecursively, DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin,
-	FixedWeightBounds, FrameTransactionalProcessor, FungibleAdapter, FungiblesAdapter, IsConcrete,
-	IsParentsOnly, MatchedConvertedConcreteId, NativeAsset, NoChecking, ParentIsPreset,
-	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	FixedWeightBounds, FrameTransactionalProcessor, FungibleAdapter, IsConcrete, NativeAsset,
+	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
 	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
 	TrailingSetTopicAsId, UsingComponents, WithComputedOrigin, WithUniqueTopic,
 };
+// TODO: To fix lint these were removed. Determine if the following imports are necessary:
+//       FungiblesAdapter, IsParentsOnly, MatchedConvertedConcreteId, NoChecking
 
 use polkadot_parachain_primitives::primitives::Sibling;
 
 use frame_support::{
 	pallet_prelude::Get,
 	parameter_types,
-	traits::{ConstU32, ConstU8, Contains, ContainsPair, Disabled, Everything, Nothing},
+	traits::{ConstU32, Contains, ContainsPair, Disabled, Everything, Nothing},
 	weights::Weight,
 };
+// TODO: To fix lint these were removed. Determine if the following imports are necessary:
+//       ConstU8
 
 pub use common_runtime::fee::WeightToFee;
 
@@ -49,7 +54,7 @@ parameter_types! {
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 	// For the real deployment, it is recommended to set `RelayNetwork` according to the relay chain
 	// and prepend `UniversalLocation` with `GlobalConsensus(RelayNetwork::get())`.
-	pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into()).into()].into();
+	pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get().unwrap()), Parachain(ParachainInfo::parachain_id().into())].into();
 	pub HereLocation: Location = Location::here();
 }
 

runtime/frequency/src/xcm_queue.rs

@@ -1,9 +1,11 @@
 // use crate::{MessageQueue, ParachainSystem, RuntimeBlockWeights, RuntimeCall, RuntimeEvent};
 // use crate::{ParachainSystem, RuntimeBlockWeights, RuntimeCall, RuntimeEvent, AccountId, RuntimeOrigin, Runtime};
 use crate::{
-	AccountId, MessageQueue, ParachainSystem, Runtime, RuntimeBlockWeights, RuntimeCall,
-	RuntimeEvent, RuntimeOrigin, XcmpQueue,
+	AccountId, MessageQueue, ParachainSystem, Runtime, RuntimeBlockWeights, RuntimeEvent,
+	RuntimeOrigin, XcmpQueue,
 };
+// TODO: To fix lint these were removed. Determine if the following imports are necessary:
+//       RuntimeCall
 use frame_support::{
 	parameter_types,
 	traits::{ConstU32, TransformOrigin},
@@ -24,6 +26,7 @@ use staging_xcm_builder::{
 };
 
 // use xcm_config;
+#[cfg(not(feature = "runtime-benchmarks"))]
 use crate::xcm_config;
 
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
@@ -34,6 +37,7 @@ use staging_xcm::latest::prelude::*;
 
 use pallet_xcm::XcmPassthrough;
 
+#[cfg(not(feature = "runtime-benchmarks"))]
 use xcm_executor;
 
 parameter_types! {