Cleanup macros

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

substrate/bin/node/runtime/src/impls.rs

@@ -115,17 +115,16 @@ impl ProposalProvider<AccountId, Hash, RuntimeCall> for AllianceProposalProvider
 
 #[cfg(test)]
 mod multiplier_tests {
-	use polkadot_sdk::{
-		frame_support::{
-			dispatch::DispatchClass,
-			weights::{Weight, WeightToFee},
-		},
-		pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment},
-		sp_runtime::{
-			assert_eq_error_rate,
-			traits::{Convert, One, Zero},
-			BuildStorage, FixedPointNumber,
-		},
+	use frame_support::{
+		dispatch::DispatchClass,
+		weights::{Weight, WeightToFee},
+	};
+	use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
+	use polkadot_sdk::*;
+	use sp_runtime::{
+		assert_eq_error_rate,
+		traits::{Convert, One, Zero},
+		BuildStorage, FixedPointNumber,
 	};
 
 	use crate::{
@@ -202,11 +201,10 @@ mod multiplier_tests {
 	where
 		F: Fn() -> (),
 	{
-		let mut t: polkadot_sdk::sp_io::TestExternalities =
-			polkadot_sdk::frame_system::GenesisConfig::<Runtime>::default()
-				.build_storage()
-				.unwrap()
-				.into();
+		let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
+			.build_storage()
+			.unwrap()
+			.into();
 		t.execute_with(|| {
 			System::set_block_consumed_resources(w, 0);
 			assertions()
@@ -313,7 +311,7 @@ mod multiplier_tests {
 			Weight::from_parts(100, 0);
 
 		// Default substrate weight.
-		let tx_weight = polkadot_sdk::frame_support::weights::constants::ExtrinsicBaseWeight::get();
+		let tx_weight = frame_support::weights::constants::ExtrinsicBaseWeight::get();
 
 		run_with_system_weight(block_weight, || {
 			// initial value configured on module
@@ -330,7 +328,7 @@ mod multiplier_tests {
 				fm = next;
 				iterations += 1;
 				let fee =
-					<Runtime as polkadot_sdk::pallet_transaction_payment::Config>::WeightToFee::weight_to_fee(
+					<Runtime as pallet_transaction_payment::Config>::WeightToFee::weight_to_fee(
 						&tx_weight,
 					);
 				let adjusted_fee = fm.saturating_mul_acc_int(fee);

substrate/bin/node/runtime/src/lib.rs

@@ -2241,9 +2241,7 @@ impl pallet_parameters::Config for Runtime {
 	type WeightInfo = ();
 }
 
-use frame_support::runtime;
-
-#[runtime]
+#[frame_support::runtime]
 mod runtime {
 	use super::*;
 
@@ -2598,7 +2596,7 @@ mod mmr {
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
-	super::frame_benchmarking::define_benchmarks!(
+	polkadot_sdk::frame_benchmarking::define_benchmarks!(
 		[frame_benchmarking, BaselineBench::<Runtime>]
 		[frame_benchmarking_pallet_pov, Pov]
 		[pallet_alliance, Alliance]

substrate/client/chain-spec/derive/src/impls.rs

@@ -171,7 +171,7 @@ pub fn derive(
 	};
 
 	let name = &ast.ident;
-	let crate_name = match crate_name(CRATE_NAME) {
+	let crate_path = match crate_name(CRATE_NAME) {
 		Ok(FoundCrate::Itself) => CRATE_NAME.replace("-", "_"),
 		Ok(FoundCrate::Name(chain_spec_name)) => chain_spec_name,
 		Err(e) => match crate_name("polkadot-sdk") {
@@ -181,7 +181,8 @@ pub fn derive(
 			},
 		},
 	};
-	let crate_path = syn::parse_str::<Path>(&crate_name).unwrap();
+	let crate_path =
+		syn::parse_str::<Path>(&crate_path).expect("crate_name returns valid path; qed");
 	let field_names = fields.named.iter().flat_map(|x| x.ident.as_ref()).collect::<Vec<_>>();
 	let field_types = fields.named.iter().map(|x| &x.ty).collect::<Vec<_>>();
 

substrate/frame/support/procedural/src/runtime/mod.rs

@@ -214,24 +214,6 @@ mod keyword {
 }
 
 pub fn runtime(attr: TokenStream, tokens: TokenStream) -> TokenStream {
-	let modified = do_runtime(attr, tokens);
-
-	/*use expander::*;
-	let expanded = Expander::new("baz")
-		.add_comment("This is generated code!".to_owned())
-		.fmt(Edition::_2021)
-		.verbose(true)
-		// common way of gating this, by making it part of the default feature set
-		.dry(cfg!(feature="no-file-expansion"))
-		.write_to_out_dir(modified.clone().into()).unwrap_or_else(|e| {
-			eprintln!("Failed to write to file: {:?}", e);
-			modified.into()
-		});
-	expanded.into()*/
-	modified
-}
-
-pub fn do_runtime(attr: TokenStream, tokens: TokenStream) -> TokenStream {
 	let mut legacy_ordering = false;
 	if !attr.is_empty() {
 		if let Ok(_) = syn::parse::<keyword::legacy_ordering>(attr.clone()) {

substrate/frame/support/procedural/tools/src/lib.rs

@@ -138,7 +138,6 @@ fn get_frame_crate_path(def_crate: &str) -> Option<syn::Path> {
 }
 
 fn get_sdk_crate_path(def_crate: &str) -> Option<syn::Path> {
-	// This does not work if the frame crate is renamed.
 	if let Ok(FoundCrate::Name(name)) = crate_name(&"polkadot-sdk") {
 		let path = format!("{}::{}", name, def_crate.to_string()).replace("-", "_");
 		Some(syn::parse_str::<syn::Path>(&path).expect("is a valid path; qed"))