Add conflicts_with and shortened command

Author: Woody4618

token/cli/src/clap_app.rs

@@ -591,6 +591,15 @@ pub fn app<'a, 'b>(
                 .possible_values(&["json", "json-compact"])
                 .help("Return information in specified output format"),
         )
+        .arg(
+            Arg::with_name("program_2022")
+                .short("2")
+                .long("program-2022")
+                .takes_value(false)
+                .global(true)
+                .conflicts_with("program_id")
+                .help("Use token extension program token 2022 with program id: TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"),
+        )
         .arg(
             Arg::with_name("program_id")
                 .short("p")
@@ -599,6 +608,7 @@ pub fn app<'a, 'b>(
                 .takes_value(true)
                 .global(true)
                 .validator(is_valid_token_program_id)
+                .conflicts_with("program_2022")
                 .help("SPL Token program id"),
         )
         .arg(
@@ -693,13 +703,6 @@ pub fn app<'a, 'b>(
                             "Enable the mint authority to close this mint"
                         ),
                 )
-                .arg(
-                    Arg::with_name("token_program_2022")
-                        .value_name("token-program-2022")
-                        .short("2")
-                        .long("token-program-2022")
-                        .takes_value(false)
-                        .help("Use token extension program token 2022 with program id: TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"))
                 .arg(
                     Arg::with_name("interest_rate")
                         .long("interest-rate")

token/cli/src/config.rs

@@ -261,7 +261,7 @@ impl<'a> Config<'a> {
 
         let default_program_id = spl_token::id();
         let (program_id, restrict_to_program_id) =
-            if matches.is_present("token_program_2022") {
+            if matches.is_present("program_2022") {
                 (spl_token_2022::id(), true)
             } else if let Some(program_id) = value_of(matches, "program_id") {
                 (program_id, true)

token/cli/tests/command.rs

@@ -496,7 +496,6 @@ async fn create_token_default(test_validator: &TestValidator, payer: &Keypair) {
     }
 }
 
-
 async fn create_token_2022(test_validator: &TestValidator, payer: &Keypair) {
     let config = test_config_with_default_signer(test_validator, payer, &spl_token_2022::id());
     let mut wallet_manager = None;
@@ -506,7 +505,7 @@ async fn create_token_2022(test_validator: &TestValidator, payer: &Keypair) {
     let args = &[
         "spl-token",
         CommandName::CreateToken.into(),
-        "--token-program-2022"
+        "--program-2022"
     ];
 
     let default_decimals = format!("{}", spl_token_2022::native_mint::DECIMALS);
@@ -520,11 +519,8 @@ async fn create_token_2022(test_validator: &TestValidator, payer: &Keypair) {
     )
     .get_matches_from(args);
 
-    let (_sub_command, sub_matches) = app_matches.subcommand();
-    let matches = sub_matches.unwrap();
-
     let config = Config::new_with_clients_and_ws_url(
-        matches,
+        &app_matches,
         &mut wallet_manager,
         &mut bulk_signers,
         &mut multisigner_ids,