Change to use the same subcommand syntax as subkey (#8678)

* Change to use the same subcommand syntax as subkey

* Update client/cli/src/commands/inspect_key.rs

* revert to InspectKeyCmd struct

substrate/bin/node/cli/src/cli.rs

@@ -41,7 +41,7 @@ pub enum Subcommand {
 		name = "inspect",
 		about = "Decode given block or extrinsic using current native runtime."
 	)]
-	Inspect(node_inspect::cli::InspectCmd),
+	Inspect(node_inspect::cli::InspectKeyCmd),
 
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]

substrate/bin/node/inspect/src/cli.rs

@@ -24,7 +24,7 @@ use structopt::StructOpt;
 
 /// The `inspect` command used to print decoded chain data.
 #[derive(Debug, StructOpt)]
-pub struct InspectCmd {
+pub struct InspectKeyCmd {
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub command: InspectSubCmd,

substrate/bin/node/inspect/src/command.rs

@@ -18,14 +18,14 @@
 
 //! Command ran by the CLI
 
-use crate::cli::{InspectCmd, InspectSubCmd};
+use crate::cli::{InspectKeyCmd, InspectSubCmd};
 use crate::Inspector;
 use sc_cli::{CliConfiguration, ImportParams, Result, SharedParams};
 use sc_service::{new_full_client, Configuration, NativeExecutionDispatch};
 use sp_runtime::traits::Block;
 use std::str::FromStr;
 
-impl InspectCmd {
+impl InspectKeyCmd {
 	/// Run the inspect command, passing the inspector.
 	pub fn run<B, RA, EX>(&self, config: Configuration) -> Result<()>
 	where
@@ -54,7 +54,7 @@ impl InspectCmd {
 	}
 }
 
-impl CliConfiguration for InspectCmd {
+impl CliConfiguration for InspectKeyCmd {
 	fn shared_params(&self) -> &SharedParams {
 		&self.shared_params
 	}

substrate/client/cli/src/commands/inspect_key.rs

@@ -25,7 +25,7 @@ use structopt::StructOpt;
 /// The `inspect` command
 #[derive(Debug, StructOpt)]
 #[structopt(
-	name = "inspect-key",
+	name = "inspect",
 	about = "Gets a public key and a SS58 address from the provided Secret URI"
 )]
 pub struct InspectKeyCmd {

substrate/client/cli/src/commands/key.rs

@@ -39,7 +39,7 @@ pub enum KeySubcommand {
 	Generate(GenerateCmd),
 
 	/// Gets a public key and a SS58 address from the provided Secret URI
-	InspectKey(InspectKeyCmd),
+	Inspect(InspectKeyCmd),
 
 	/// Print the peer ID corresponding to the node key in the given file
 	InspectNodeKey(InspectNodeKeyCmd),
@@ -54,7 +54,7 @@ impl KeySubcommand {
 		match self {
 			KeySubcommand::GenerateNodeKey(cmd) => cmd.run(),
 			KeySubcommand::Generate(cmd) => cmd.run(),
-			KeySubcommand::InspectKey(cmd) => cmd.run(),
+			KeySubcommand::Inspect(cmd) => cmd.run(),
 			KeySubcommand::Insert(cmd) => cmd.run(cli),
 			KeySubcommand::InspectNodeKey(cmd) => cmd.run(),
 		}