Browse Source

Improved error message when verify command fails on missing program or IDL (#2225)

eydelrivero 3 years ago
parent
commit
b9b2737c18
1 changed files with 4 additions and 4 deletions
  1. 4 4
      cli/src/lib.rs

+ 4 - 4
cli/src/lib.rs

@@ -1364,7 +1364,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result<
         let account = client
         let account = client
             .get_account_with_commitment(&program_id, CommitmentConfig::default())?
             .get_account_with_commitment(&program_id, CommitmentConfig::default())?
             .value
             .value
-            .map_or(Err(anyhow!("Account not found")), Ok)?;
+            .map_or(Err(anyhow!("Program account not found")), Ok)?;
         if account.owner == bpf_loader::id() || account.owner == bpf_loader_deprecated::id() {
         if account.owner == bpf_loader::id() || account.owner == bpf_loader_deprecated::id() {
             let bin = account.data.to_vec();
             let bin = account.data.to_vec();
             let state = BinVerificationState::ProgramData {
             let state = BinVerificationState::ProgramData {
@@ -1383,7 +1383,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result<
                             CommitmentConfig::default(),
                             CommitmentConfig::default(),
                         )?
                         )?
                         .value
                         .value
-                        .map_or(Err(anyhow!("Account not found")), Ok)?;
+                        .map_or(Err(anyhow!("Program data account not found")), Ok)?;
                     let bin = account.data
                     let bin = account.data
                         [UpgradeableLoaderState::programdata_data_offset().unwrap_or(0)..]
                         [UpgradeableLoaderState::programdata_data_offset().unwrap_or(0)..]
                         .to_vec();
                         .to_vec();
@@ -1477,14 +1477,14 @@ fn fetch_idl(cfg_override: &ConfigOverride, idl_addr: Pubkey) -> Result<Idl> {
     let mut account = client
     let mut account = client
         .get_account_with_commitment(&idl_addr, CommitmentConfig::processed())?
         .get_account_with_commitment(&idl_addr, CommitmentConfig::processed())?
         .value
         .value
-        .map_or(Err(anyhow!("Account not found")), Ok)?;
+        .map_or(Err(anyhow!("IDL account not found")), Ok)?;
 
 
     if account.executable {
     if account.executable {
         let idl_addr = IdlAccount::address(&idl_addr);
         let idl_addr = IdlAccount::address(&idl_addr);
         account = client
         account = client
             .get_account_with_commitment(&idl_addr, CommitmentConfig::processed())?
             .get_account_with_commitment(&idl_addr, CommitmentConfig::processed())?
             .value
             .value
-            .map_or(Err(anyhow!("Account not found")), Ok)?;
+            .map_or(Err(anyhow!("IDL account not found")), Ok)?;
     }
     }
 
 
     // Cut off account discriminator.
     // Cut off account discriminator.