Restructure frame_support macro related exports (#14745)

* make reexports private

* make reexports private 2

* make reexports private for runtime-benchmarking

* make reexports private for try-runtime

* fix for try-runtime

* make reexports private for tests

* fmt

* make reexports private for tests

* make reexports private for experimental

* fix beefy

* fix ui test

* fix ui test

* fix benches

* ".git/.scripts/commands/fmt/fmt.sh"

* fix contracts use

* wip

* wip

* do not reexport sp_api::metadata_ir

* fix CI checks

* fix support tests

* ".git/.scripts/commands/fmt/fmt.sh"

* Update frame/support/src/lib.rs

Co-authored-by: Bastian Köcher <git@kchr.de>

* import codec directly

* fmt

* fix node-cli tests

---------

Co-authored-by: command-bot <>
Co-authored-by: Bastian Köcher <git@kchr.de>

substrate/frame/session/Cargo.toml

@@ -27,6 +27,7 @@ sp-session = { version = "4.0.0-dev", default-features = false, path = "../../pr
 sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../primitives/staking", features = ["serde"] }
 sp-std = { version = "8.0.0", default-features = false, path = "../../primitives/std" }
 sp-trie = { version = "22.0.0", default-features = false, optional = true, path = "../../primitives/trie" }
+sp-state-machine = { version = "0.28.0", default-features = false, path = "../../primitives/state-machine" }
 
 [features]
 default = ["historical", "std"]
@@ -45,6 +46,7 @@ std = [
 	"sp-staking/std",
 	"sp-std/std",
 	"sp-trie/std",
+	"sp-state-machine/std",
 ]
 try-runtime = [
 	"frame-support/try-runtime",

substrate/frame/session/benchmarking/Cargo.toml

@@ -13,6 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 rand = { version = "0.8.5", default-features = false, features = ["std_rng"] }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../../benchmarking" }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }

substrate/frame/session/benchmarking/src/lib.rs

@@ -26,11 +26,9 @@ mod mock;
 use sp_runtime::traits::{One, StaticLookup, TrailingZeroInput};
 use sp_std::{prelude::*, vec};
 
+use codec::Decode;
 use frame_benchmarking::v1::benchmarks;
-use frame_support::{
-	codec::Decode,
-	traits::{Get, KeyOwnerProofSystem, OnInitialize},
-};
+use frame_support::traits::{Get, KeyOwnerProofSystem, OnInitialize};
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
 use pallet_session::{historical::Pallet as Historical, Pallet as Session, *};
 use pallet_staking::{

substrate/frame/session/src/historical/mod.rs

@@ -378,11 +378,9 @@ pub(crate) mod tests {
 	};
 
 	use sp_runtime::{key_types::DUMMY, testing::UintAuthorityId, BuildStorage};
+	use sp_state_machine::BasicExternalities;
 
-	use frame_support::{
-		traits::{KeyOwnerProofSystem, OnInitialize},
-		BasicExternalities,
-	};
+	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
 
 	type Historical = Pallet<Test>;
 

substrate/frame/session/src/historical/offchain.rs

@@ -150,11 +150,9 @@ mod tests {
 		offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt, StorageKind},
 	};
 	use sp_runtime::{testing::UintAuthorityId, BuildStorage};
+	use sp_state_machine::BasicExternalities;
 
-	use frame_support::{
-		traits::{KeyOwnerProofSystem, OnInitialize},
-		BasicExternalities,
-	};
+	use frame_support::traits::{KeyOwnerProofSystem, OnInitialize};
 
 	type Historical = Pallet<Test>;
 

substrate/frame/session/src/lib.rs

@@ -115,8 +115,8 @@ mod mock;
 mod tests;
 pub mod weights;
 
+use codec::{Decode, MaxEncodedLen};
 use frame_support::{
-	codec::{Decode, MaxEncodedLen},
 	dispatch::{DispatchError, DispatchResult},
 	ensure,
 	traits::{

substrate/frame/session/src/mock.rs

@@ -32,11 +32,11 @@ use sp_runtime::{
 	BuildStorage,
 };
 use sp_staking::SessionIndex;
+use sp_state_machine::BasicExternalities;
 
 use frame_support::{
 	parameter_types,
 	traits::{ConstU32, ConstU64},
-	BasicExternalities,
 };
 
 impl_opaque_keys! {