Merge branch 'master' into skunert/clap-3222

client/cli/src/params/import_params.rs

@@ -41,18 +41,6 @@ pub struct ImportParams {
 	#[clap(flatten)]
 	pub database_params: DatabaseParams,
 
-	/// THIS IS A DEPRECATED CLI-ARGUMENT.
-	///
-	/// It has been preserved in order to not break the compatibility with the existing scripts.
-	/// Enabling this option will lead to a runtime warning.
-	/// In future this option will be removed completely, thus specifying it will lead to a start
-	/// up error.
-	///
-	/// Details: <https://github.com/paritytech/substrate/issues/8103>
-	#[arg(long)]
-	#[deprecated = "According to https://github.com/paritytech/substrate/issues/8103"]
-	pub unsafe_pruning: bool,
-
 	/// Method for executing Wasm runtime code.
 	#[arg(
 		long = "wasm-execution",

utils/frame/benchmarking-cli/src/pallet/mod.rs

@@ -35,11 +35,11 @@ fn parse_pallet_name(pallet: &str) -> std::result::Result<String, String> {
 #[derive(Debug, clap::Parser)]
 pub struct PalletCmd {
 	/// Select a FRAME Pallet to benchmark, or `*` for all (in which case `extrinsic` must be `*`).
-	#[arg(short, long, value_parser = parse_pallet_name, required_unless_present = "list")]
+	#[arg(short, long, value_parser = parse_pallet_name, required_unless_present_any = ["list", "json_input"])]
 	pub pallet: Option<String>,
 
 	/// Select an extrinsic inside the pallet to benchmark, or `*` for all.
-	#[arg(short, long, required_unless_present = "list")]
+	#[arg(short, long, required_unless_present_any = ["list", "json_input"])]
 	pub extrinsic: Option<String>,
 
 	/// Select how many samples we should take across the variable components.
@@ -170,6 +170,6 @@ pub struct PalletCmd {
 	/// A path to a `.json` file with existing benchmark results generated with `--json` or
 	/// `--json-file`. When specified the benchmarks are not actually executed, and the data for
 	/// the analysis is read from this file.
-	#[clap(long)]
+	#[arg(long)]
 	pub json_input: Option<PathBuf>,
 }