Formatting

Author: Woody4618

token/cli/src/config.rs

@@ -260,30 +260,29 @@ impl<'a> Config<'a> {
         let dump_transaction_message = matches.is_present(DUMP_TRANSACTION_MESSAGE.name);
 
         let default_program_id = spl_token::id();
-        let (program_id, restrict_to_program_id) =
-            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)
-            } else if !sign_only {
-                if let Some(address) = value_of(matches, "token")
-                    .or_else(|| value_of(matches, "account"))
-                    .or_else(|| value_of(matches, "address"))
-                {
-                    (
-                        rpc_client
-                            .get_account(&address)
-                            .await
-                            .map(|account| account.owner)
-                            .unwrap_or(default_program_id),
-                        false,
-                    )
-                } else {
-                    (default_program_id, false)
-                }
+        let (program_id, restrict_to_program_id) = 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)
+        } else if !sign_only {
+            if let Some(address) = value_of(matches, "token")
+                .or_else(|| value_of(matches, "account"))
+                .or_else(|| value_of(matches, "address"))
+            {
+                (
+                    rpc_client
+                        .get_account(&address)
+                        .await
+                        .map(|account| account.owner)
+                        .unwrap_or(default_program_id),
+                    false,
+                )
             } else {
                 (default_program_id, false)
-            };
+            }
+        } else {
+            (default_program_id, false)
+        };
 
         // need to specify a compute limit if compute price and blockhash are specified
         if matches.is_present(BLOCKHASH_ARG.name)

token/cli/tests/command.rs

@@ -505,9 +505,9 @@ async fn create_token_2022(test_validator: &TestValidator, payer: &Keypair) {
     let args = &[
         "spl-token",
         CommandName::CreateToken.into(),
-        "--program-2022"
+        "--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();
@@ -527,7 +527,8 @@ async fn create_token_2022(test_validator: &TestValidator, payer: &Keypair) {
         config.rpc_client.clone(),
         config.program_client.clone(),
         config.websocket_url.clone(),
-    ).await; 
+    )
+    .await;
 
     assert_eq!(config.program_id, spl_token_2022::ID);
 }