From de5dc13384131653fe41d1045168407a748feb1c Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:30:01 +1000
Subject: [PATCH] keys: tell the user where a key is saved

Close #1810
---
 cmd/soroban-cli/src/commands/keys/add.rs    | 13 +++++++++----
 cmd/soroban-cli/src/commands/network/add.rs |  6 +++---
 cmd/soroban-cli/src/config/locator.rs       | 12 ++++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/keys/add.rs b/cmd/soroban-cli/src/commands/keys/add.rs
index d8f528bae..a9217574b 100644
--- a/cmd/soroban-cli/src/commands/keys/add.rs
+++ b/cmd/soroban-cli/src/commands/keys/add.rs
@@ -1,6 +1,9 @@
 use clap::command;
 
-use crate::config::{locator, secret};
+use crate::{
+    config::{locator, secret},
+    print::Print,
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -26,8 +29,10 @@ pub struct Cmd {
 
 impl Cmd {
     pub fn run(&self) -> Result<(), Error> {
-        Ok(self
-            .config_locator
-            .write_identity(&self.name, &self.secrets.read_secret()?)?)
+        let print = Print::new(false);
+        let secret = self.secrets.read_secret()?;
+        let path = self.config_locator.write_identity(&self.name, &secret)?;
+        print.checkln(format!("Key saved with alias {:?} in {path:?}", self.name));
+        Ok(())
     }
 }
diff --git a/cmd/soroban-cli/src/commands/network/add.rs b/cmd/soroban-cli/src/commands/network/add.rs
index 20b1afa7b..feeea9030 100644
--- a/cmd/soroban-cli/src/commands/network/add.rs
+++ b/cmd/soroban-cli/src/commands/network/add.rs
@@ -25,8 +25,8 @@ pub struct Cmd {
 
 impl Cmd {
     pub fn run(&self) -> Result<(), Error> {
-        Ok(self
-            .config_locator
-            .write_network(&self.name, &self.network)?)
+        self.config_locator
+            .write_network(&self.name, &self.network)?;
+        Ok(())
     }
 }
diff --git a/cmd/soroban-cli/src/config/locator.rs b/cmd/soroban-cli/src/config/locator.rs
index b6f5c75c1..7e97f6796 100644
--- a/cmd/soroban-cli/src/config/locator.rs
+++ b/cmd/soroban-cli/src/config/locator.rs
@@ -162,11 +162,11 @@ impl Args {
         )
     }
 
-    pub fn write_identity(&self, name: &str, secret: &Secret) -> Result<(), Error> {
+    pub fn write_identity(&self, name: &str, secret: &Secret) -> Result<PathBuf, Error> {
         KeyType::Identity.write(name, secret, &self.config_dir()?)
     }
 
-    pub fn write_network(&self, name: &str, network: &Network) -> Result<(), Error> {
+    pub fn write_network(&self, name: &str, network: &Network) -> Result<PathBuf, Error> {
         KeyType::Network.write(name, network, &self.config_dir()?)
     }
 
@@ -441,10 +441,14 @@ impl KeyType {
         key: &str,
         value: &T,
         pwd: &Path,
-    ) -> Result<(), Error> {
+    ) -> Result<PathBuf, Error> {
         let filepath = ensure_directory(self.path(pwd, key))?;
         let data = toml::to_string(value).map_err(|_| Error::ConfigSerialization)?;
-        std::fs::write(&filepath, data).map_err(|error| Error::IdCreationFailed { filepath, error })
+        std::fs::write(&filepath, data).map_err(|error| Error::IdCreationFailed {
+            filepath: filepath.clone(),
+            error,
+        })?;
+        Ok(filepath)
     }
 
     fn root(&self, pwd: &Path) -> PathBuf {