final minor cleanup items

PeggyJV · Jul 16, 2021 · 7f9b773 · 7f9b773
1 parent a6e2d6c
commit 7f9b773
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/orchestrator/gorc/src/commands/keys/cosmos.rs b/orchestrator/gorc/src/commands/keys/cosmos.rs
@@ -1,11 +1,9 @@
-//! `cosmos keys` subcommand
-
 mod add;
 mod delete;
 mod import;
 mod list;
-mod show;
 mod rename;
+mod show;
 
 use abscissa_core::{Command, Options, Runnable};
 
@@ -14,7 +12,7 @@ pub enum CosmosKeysCmd {
     #[options(help = "add [name]")]
     Add(add::AddCosmosKeyCmd),
 
-    #[options(help = "import [name] [mnemnoic]")]
+    #[options(help = "import [name] (bip39-mnemnoic)")]
     Import(import::ImportCosmosKeyCmd),
 
     #[options(help = "delete [name]")]
@@ -29,4 +27,3 @@ pub enum CosmosKeysCmd {
     #[options(help = "show [name]")]
     Show(show::ShowCosmosKeyCmd),
 }
-
diff --git a/orchestrator/gorc/src/commands/keys/cosmos/import.rs b/orchestrator/gorc/src/commands/keys/cosmos/import.rs
@@ -35,11 +35,11 @@ impl Runnable for ImportCosmosKeyCmd {
 
         let mnemonic = match self.args.get(1) {
             Some(mnemonic) => mnemonic.clone(),
-            None => rpassword::read_password_from_tty(Some("> Enter your bip39 mnemonic:\n"))
+            None => rpassword::read_password_from_tty(Some("> Enter your bip39-mnemonic:\n"))
                 .expect("Could not read mnemonic"),
         };
 
-        let mnemonic = bip32::Mnemonic::new(mnemonic.trim_end(), Default::default())
+        let mnemonic = bip32::Mnemonic::new(mnemonic.trim(), Default::default())
             .expect("Could not parse mnemonic");
 
         let seed = mnemonic.to_seed("");

diff --git a/orchestrator/gorc/src/commands/keys/cosmos/show.rs b/orchestrator/gorc/src/commands/keys/cosmos/show.rs
@@ -31,7 +31,7 @@ impl Runnable for ShowCosmosKeyCmd {
             .expect("Could not parse private key");
 
         let address = key
-            .to_address("cosmos")
+            .to_address(config.cosmos.prefix.trim())
             .expect("Could not generate public key");
 
         println!("{}\t{}", name, address)

diff --git a/orchestrator/gorc/src/commands/keys/eth.rs b/orchestrator/gorc/src/commands/keys/eth.rs
@@ -1,5 +1,3 @@
-//! `eth keys` subcommands
-
 mod add;
 mod delete;
 mod import;
@@ -11,10 +9,10 @@ use abscissa_core::{Command, Options, Runnable};
 
 #[derive(Command, Debug, Options, Runnable)]
 pub enum EthKeysCmd {
-    #[options(help = "add [name] (password)")]
+    #[options(help = "add [name]")]
     Add(add::AddEthKeyCmd),
 
-    #[options(help = "import [name] (mnemonic) (password)")]
+    #[options(help = "import [name] (bip39-mnemonic)")]
     Import(import::ImportEthKeyCmd),
 
     #[options(help = "delete [name]")]
@@ -28,9 +26,4 @@ pub enum EthKeysCmd {
 
     #[options(help = "show [name]")]
     Show(show::ShowEthKeyCmd),
-}
-
-impl EthKeysCmd {
-    //fn run(&self){
-    //}
-}
+}
diff --git a/orchestrator/gorc/src/commands/keys/eth/import.rs b/orchestrator/gorc/src/commands/keys/eth/import.rs
@@ -34,7 +34,7 @@ impl Runnable for ImportEthKeyCmd {
 
         let mnemonic = match self.args.get(1) {
             Some(mnemonic) => mnemonic.clone(),
-            None => rpassword::read_password_from_tty(Some("> Enter your bip39 mnemonic:\n"))
+            None => rpassword::read_password_from_tty(Some("> Enter your bip39-mnemonic:\n"))
                 .expect("Could not read mnemonic"),
         };