Companion: restructure macro related exports (#3015)

* restructure macro related exports

* restructure macro related exports

* wip

* wip

* update cargo lock

* refactor RuntimeDebug on unincluded segment

* fmt

* Companion: restructure `benchmarking` macro related exports (#3039)

* wip

* wip

* restructure benchmarking macro related exports

* add cargo lock

---------

Co-authored-by: parity-processbot <>

cumulus/pallets/collator-selection/src/benchmarking.rs

@@ -21,11 +21,11 @@ use super::*;
 
 #[allow(unused)]
 use crate::Pallet as CollatorSelection;
+use codec::Decode;
 use frame_benchmarking::{
 	account, impl_benchmark_test_suite, v2::*, whitelisted_caller, BenchmarkError,
 };
 use frame_support::{
-	codec::Decode,
 	dispatch::DispatchResult,
 	traits::{Currency, EnsureOrigin, Get, ReservableCurrency},
 };

cumulus/pallets/collator-selection/src/lib.rs

@@ -83,10 +83,6 @@ pub mod pallet {
 	use frame_support::{
 		dispatch::{DispatchClass, DispatchResultWithPostInfo},
 		pallet_prelude::*,
-		sp_runtime::{
-			traits::{AccountIdConversion, CheckedSub, Saturating, Zero},
-			RuntimeDebug,
-		},
 		traits::{
 			Currency, EnsureOrigin, ExistenceRequirement::KeepAlive, ReservableCurrency,
 			ValidatorRegistration,
@@ -95,7 +91,10 @@ pub mod pallet {
 	};
 	use frame_system::{pallet_prelude::*, Config as SystemConfig};
 	use pallet_session::SessionManager;
-	use sp_runtime::traits::Convert;
+	use sp_runtime::{
+		traits::{AccountIdConversion, CheckedSub, Convert, Saturating, Zero},
+		RuntimeDebug,
+	};
 	use sp_staking::SessionIndex;
 	use sp_std::vec::Vec;
 

cumulus/pallets/collator-selection/src/migration.rs

@@ -17,7 +17,8 @@
 //! A module that is responsible for migration of storage for Collator Selection.
 
 use super::*;
-use frame_support::{log, traits::OnRuntimeUpgrade};
+use frame_support::traits::OnRuntimeUpgrade;
+use log;
 
 /// Version 1 Migration
 /// This migration ensures that any existing `Invulnerables` storage lists are sorted.

cumulus/pallets/parachain-system/src/lib.rs

@@ -42,7 +42,6 @@ use frame_support::{
 	storage,
 	traits::Get,
 	weights::Weight,
-	RuntimeDebug,
 };
 use frame_system::{ensure_none, ensure_root, pallet_prelude::HeaderFor};
 use polkadot_parachain::primitives::RelayChainBlockNumber;
@@ -53,6 +52,7 @@ use sp_runtime::{
 		InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
 		ValidTransaction,
 	},
+	RuntimeDebug,
 };
 use sp_std::{cmp, collections::btree_map::BTreeMap, prelude::*};
 use xcm::latest::XcmHash;

cumulus/pallets/parachain-system/src/unincluded_segment.rs

@@ -23,8 +23,8 @@
 use super::relay_state_snapshot::{MessagingStateSnapshot, RelayDispatchQueueRemainingCapacity};
 use codec::{Decode, Encode};
 use cumulus_primitives_core::{relay_chain, ParaId};
-use frame_support::RuntimeDebug;
 use scale_info::TypeInfo;
+use sp_runtime::RuntimeDebug;
 use sp_std::{collections::btree_map::BTreeMap, marker::PhantomData};
 
 /// Constraints on outbound HRMP channel.