Node/p2p: add filename when failed to decrypt a file

Author: dannywillems

node/account/src/secret_key.rs

@@ -237,7 +237,7 @@ mod tests {
 
         // load and decrypt
         let decrypted = AccountSecretKey::from_encrypted_file(&tmp_path, password)
-            .expect("Failed to decrypt secret key file");
+            .unwrap_or_else(|_| panic!("Failed to decrypt secret key file: {}", tmp_path));
 
         assert_eq!(
             new_key.public_key(),
@@ -252,7 +252,7 @@ mod tests {
         let key_path = "../tests/files/accounts/test-key-1";
         let expected_public_key = "B62qmg7n4XqU3SFwx9KD9B7gxsKwxJP5GmxtBpHp1uxyN3grujii9a1";
         let decrypted = AccountSecretKey::from_encrypted_file(key_path, password)
-            .expect("Failed to decrypt secret key file");
+            .unwrap_or_else(|_| panic!("Failed to decrypt secret key file: {}", key_path));
 
         assert_eq!(
             expected_public_key.to_string(),

node/native/src/node/builder.rs

@@ -213,8 +213,12 @@ impl NodeBuilder {
         password: &str,
         provers: Option<BlockProver>,
     ) -> anyhow::Result<&mut Self> {
-        let key = AccountSecretKey::from_encrypted_file(path, password)
-            .context("Failed to decrypt secret key file")?;
+        let key = AccountSecretKey::from_encrypted_file(&path, password).with_context(|| {
+            format!(
+                "Failed to decrypt secret key file: {}",
+                path.as_ref().display()
+            )
+        })?;
         Ok(self.block_producer(key, provers))
     }
 

p2p/src/identity/secret_key.rs

@@ -295,7 +295,7 @@ mod tests {
         let expected_peer_id = "12D3KooWDxyuJKSsVEwNR13UVwf4PEfs4yHkk3ecZipBPv3Y3Sac";
 
         let decrypted = SecretKey::from_encrypted_file(key_path, password)
-            .expect("Failed to decrypt secret key file");
+            .unwrap_or_else(|_| panic!("Failed to decrypt secret key file: {}", key_path));
 
         let peer_id = decrypted.public_key().peer_id().to_libp2p_string();
         assert_eq!(expected_peer_id, peer_id);