[aptos] Make a directory for key generation if it doesn't exist

Closes: aptos-labs#911
shepf · May 11, 2022 · 25b1a95 · 25b1a95
1 parent 84db3d0
commit 25b1a95
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/crates/aptos/README.md b/crates/aptos/README.md
@@ -673,14 +673,12 @@ To generate this using the `aptos` CLI:
 1. Generate your validator's keys:
 
 ```
-mkdir bobs
 cargo run --package aptos -- genesis generate-keys --output-dir bobs
 ```
 
 2. Generate your `ValidatorConfiguration`:
 
 ```
-mkdir my_config
 cargo run --package aptos -- \\
     genesis set-validator-configuration \\
     --keys-dir bobs \\

diff --git a/crates/aptos/src/genesis/git.rs b/crates/aptos/src/genesis/git.rs
@@ -159,6 +159,8 @@ impl Client {
     pub fn put<T: Serialize + ?Sized>(&self, name: &str, input: &T) -> CliTypedResult<()> {
         match self {
             Client::Local(local_repository_path) => {
+                self.create_dir(local_repository_path.to_str().unwrap())?;
+
                 let path = local_repository_path.join(format!("{}.yaml", name));
                 write_to_file(
                     path.as_path(),
@@ -178,9 +180,7 @@ impl Client {
         match self {
             Client::Local(local_repository_path) => {
                 let path = local_repository_path.join(name);
-                if path.exists() && path.is_dir() {
-                    // Do nothing
-                } else {
+                if !path.exists() || !path.is_dir() {
                     std::fs::create_dir(path.as_path())
                         .map_err(|e| CliError::IO(path.display().to_string(), e))?
                 };

diff --git a/crates/aptos/src/genesis/keys.rs b/crates/aptos/src/genesis/keys.rs
@@ -54,6 +54,12 @@ impl CliCommand<PathBuf> for GenerateKeys {
             consensus_key,
             network_key,
         };
+
+        if !self.output_dir.exists() || !self.output_dir.is_dir() {
+            std::fs::create_dir(&self.output_dir)
+                .map_err(|e| CliError::IO(self.output_dir.to_str().unwrap().to_string(), e))?
+        };
+
         write_to_file(
             keys_file.as_path(),
             "private_keys.yaml",