update for ui change to subcommand()

solana-labs · Sep 3, 2023 · 6bb8531 · 6bb8531
1 parent faffd61
commit 6bb8531
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/token/cli/src/bench.rs b/token/cli/src/bench.rs
@@ -173,8 +173,9 @@ pub(crate) async fn bench_process_command(
 ) -> CommandResult {
     assert!(!config.sign_only);
 
-    match matches.subcommand() {
-        ("create-accounts", Some(arg_matches)) => {
+    let subcommand = matches.subcommand().unwrap();
+    match subcommand {
+        ("create-accounts", arg_matches) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -186,7 +187,7 @@ pub(crate) async fn bench_process_command(
 
             command_create_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("close-accounts", Some(arg_matches)) => {
+        ("close-accounts", arg_matches) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -197,7 +198,7 @@ pub(crate) async fn bench_process_command(
 
             command_close_accounts(config, signers, &token, n, &owner).await?;
         }
-        ("deposit-into", Some(arg_matches)) => {
+        ("deposit-into", arg_matches) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();
@@ -212,7 +213,7 @@ pub(crate) async fn bench_process_command(
             )
             .await?;
         }
-        ("withdraw-from", Some(arg_matches)) => {
+        ("withdraw-from", arg_matches) => {
             let token = pubkey_of_signer(arg_matches, "token", wallet_manager)
                 .unwrap()
                 .unwrap();

diff --git a/token/cli/src/main.rs b/token/cli/src/main.rs
@@ -4225,9 +4225,9 @@ async fn main() -> Result<(), Error> {
     let mut wallet_manager = None;
     let mut bulk_signers: Vec<Arc<dyn Signer>> = Vec::new();
 
-    let (sub_command, sub_matches) = app_matches.subcommand();
+    let (sub_command, sub_matches) = app_matches.subcommand().unwrap();
     let sub_command = CommandName::from_str(sub_command).unwrap();
-    let matches = sub_matches.unwrap();
+    let matches = sub_matches;
 
     let mut multisigner_ids = Vec::new();
     let config = Config::new(
@@ -5392,9 +5392,9 @@ mod tests {
             &multisig_member_help,
         )
         .get_matches_from(args);
-        let (sub_command, sub_matches) = app_matches.subcommand();
+        let (sub_command, sub_matches) = app_matches.subcommand().unwrap();
         let sub_command = CommandName::from_str(sub_command).unwrap();
-        let matches = sub_matches.unwrap();
+        let matches = sub_matches;
 
         let wallet_manager = None;
         let bulk_signers: Vec<Arc<dyn Signer>> = vec![Arc::new(clone_keypair(payer))];
@@ -5412,9 +5412,9 @@ mod tests {
             &multisig_member_help,
         )
         .get_matches_from(args);
-        let (sub_command, sub_matches) = app_matches.subcommand();
+        let (sub_command, sub_matches) = app_matches.subcommand().unwrap();
         let sub_command = CommandName::from_str(sub_command).unwrap();
-        let matches = sub_matches.unwrap();
+        let matches = sub_matches;
 
         let mut wallet_manager = None;
         let mut bulk_signers: Vec<Arc<dyn Signer>> = Vec::new();