[token-cli] Upgrade to clap-v3

token/cli/Cargo.toml

@@ -13,14 +13,14 @@ walkdir = "2"
 
 [dependencies]
 base64 = "0.22.0"
-clap = "2.33.3"
+clap = "3.2.23"
 console = "0.15.8"
 futures = "0.3"
 serde = "1.0.198"
 serde_derive = "1.0.103"
 serde_json = "1.0.116"
 solana-account-decoder = ">=1.18.11,<=2"
-solana-clap-utils = ">=1.18.11,<=2"
+solana-clap-v3-utils = ">=1.18.11,<=2"
 solana-cli-config = ">=1.18.11,<=2"
 solana-cli-output = ">=1.18.11,<=2"
 solana-client = ">=1.18.11,<=2"
@@ -29,19 +29,19 @@ solana-remote-wallet = ">=1.18.11,<=2"
 solana-sdk = ">=1.18.11,<=2"
 solana-transaction-status = ">=1.18.11,<=2"
 spl-token = { version = "4.0", path = "../program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-token-2022 = { version = "3.0.2", path = "../program-2022", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-token-client = { version = "0.10.0", path = "../client" }
 spl-token-metadata-interface = { version = "0.3.3", path = "../../token-metadata/interface" }
 spl-token-group-interface = { version = "0.2.3", path = "../../token-group/interface" }
 spl-associated-token-account = { version = "3.0.2", path = "../../associated-token-account/program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 spl-memo = { version = "4.0", path = "../../memo/program", features = [
-  "no-entrypoint",
+    "no-entrypoint",
 ] }
 strum = "0.26"
 strum_macros = "0.26"

token/cli/src/bench.rs

@@ -2,7 +2,7 @@
 use {
     crate::{clap_app::Error, command::CommandResult, config::Config},
     clap::{value_t_or_exit, ArgMatches},
-    solana_clap_utils::input_parsers::pubkey_of_signer,
+    solana_clap_v3_utils::input_parsers::pubkey_of_signer,
     solana_client::{
         nonblocking::rpc_client::RpcClient, rpc_client::RpcClient as BlockingRpcClient,
         tpu_client::TpuClient, tpu_client::TpuClientConfig,
@@ -22,15 +22,15 @@ use {
 };
 
 pub(crate) async fn bench_process_command(
-    matches: &ArgMatches<'_>,
+    matches: &ArgMatches,
     config: &Config<'_>,
     mut signers: Vec<Arc<dyn Signer>>,
     wallet_manager: &mut Option<Rc<RemoteWalletManager>>,
 ) -> CommandResult {
     assert!(!config.sign_only);
 
     match matches.subcommand() {
-        ("create-accounts", Some(arg_matches)) => {
+        Some(("create-accounts", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -42,7 +42,7 @@ pub(crate) async fn bench_process_command(
 
             command_create_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("close-accounts", Some(arg_matches)) => {
+        Some(("close-accounts", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -53,7 +53,7 @@ pub(crate) async fn bench_process_command(
 
             command_close_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("deposit-into", Some(arg_matches)) => {
+        Some(("deposit-into", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -68,7 +68,7 @@ pub(crate) async fn bench_process_command(
             )
             .await?;
         }
-        ("withdraw-from", Some(arg_matches)) => {
+        Some(("withdraw-from", arg_matches)) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();