Added test and short version

Author: Woody4618

token/cli/src/clap_app.rs

@@ -656,12 +656,6 @@ pub fn app<'a, 'b>(
                              [default: randomly generated keypair]"
                         ),
                 )
-                .arg(
-                    Arg::with_name("program_2022")
-                        .value_name("TOKEN_22_PROGRAM_ID")
-                        .short("token22")
-                        .long("TokenProgram22")
-                        .help("Use token extension program token 2022 program id: TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"))
                 .arg(
                     Arg::with_name("mint_authority")
                         .long("mint-authority")
@@ -699,6 +693,13 @@ 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("program_2022") {
+            if matches.is_present("token_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

@@ -92,6 +92,7 @@ async fn main() {
     // maybe come up with a way to do this through a some macro tag on the function?
     let tests = vec![
         async_trial!(create_token_default, test_validator, payer),
+        async_trial!(create_token_2022, test_validator, payer),
         async_trial!(create_token_interest_bearing, test_validator, payer),
         async_trial!(set_interest_rate, test_validator, payer),
         async_trial!(supply, test_validator, payer),
@@ -495,6 +496,46 @@ 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;
+    let mut bulk_signers: Vec<Arc<dyn Signer>> = Vec::new();
+    let mut multisigner_ids = Vec::new();
+
+    let args = &[
+        "spl-token",
+        CommandName::CreateToken.into(),
+        "--token-program-2022"
+    ];
+    
+    let default_decimals = format!("{}", spl_token_2022::native_mint::DECIMALS);
+    let minimum_signers_help = minimum_signers_help_string();
+    let multisig_member_help = multisig_member_help_string();
+
+    let app_matches = app(
+        &default_decimals,
+        &minimum_signers_help,
+        &multisig_member_help,
+    )
+    .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,
+        &mut wallet_manager,
+        &mut bulk_signers,
+        &mut multisigner_ids,
+        config.rpc_client.clone(),
+        config.program_client.clone(),
+        config.websocket_url.clone(),
+    ).await; 
+
+    assert_eq!(config.program_id, spl_token_2022::ID);
+}
+
 async fn create_token_interest_bearing(test_validator: &TestValidator, payer: &Keypair) {
     let config = test_config_with_default_signer(test_validator, payer, &spl_token_2022::id());
     let rate_bps: i16 = 100;