cli cleanup (#15990) (#15996)

(cherry picked from commit 067b390194)

Co-authored-by: Jack May <jack@solana.com>

cli-output/src/cli_output.rs

@@ -1631,6 +1631,7 @@ pub struct CliUpgradeableBuffer {
     pub authority: String,
     pub data_len: usize,
     pub lamports: u64,
+    #[serde(skip_serializing)]
     pub use_lamports_unit: bool,
 }
 impl QuietDisplay for CliUpgradeableBuffer {}
@@ -1659,6 +1660,7 @@ impl fmt::Display for CliUpgradeableBuffer {
 #[serde(rename_all = "camelCase")]
 pub struct CliUpgradeableBuffers {
     pub buffers: Vec<CliUpgradeableBuffer>,
+    #[serde(skip_serializing)]
     pub use_lamports_unit: bool,
 }
 impl QuietDisplay for CliUpgradeableBuffers {}

cli/src/program.rs

@@ -1375,9 +1375,6 @@ fn process_close(
                         authority_signer,
                     )?;
 
-                    if let Ok(UpgradeableLoaderState::Buffer { authority_address }) =
-                        account.state()
-                    {
                     buffers.push(CliUpgradeableBuffer {
                         address: account_pubkey.to_string(),
                         authority: authority_address
@@ -1387,9 +1384,6 @@ fn process_close(
                         lamports: account.lamports,
                         use_lamports_unit,
                     });
-                    } else {
-                        return Err(format!("Error parsing account {}", account_pubkey).into());
-                    }
                 }
             } else {
                 return Err(format!(