grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chaning docopt config a bit

Browse Source
This commit is contained in:
Nikolay Volf 2016-03-09 23:39:36 +04:00
parent 7ff4d14544
commit accc1db43f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
parity/main.rs
View File

@ -71,7 +71,7 @@ Parity. Ethereum Client.
Usage: Usage:
parity daemon <pid-file> [options] [ --no-bootstrap | <enode>... ] parity daemon <pid-file> [options] [ --no-bootstrap | <enode>... ]
parity account <command> parity account (new | list)
parity [options] [ --no-bootstrap | <enode>... ] parity [options] [ --no-bootstrap | <enode>... ]
Protocol Options: Protocol Options:
@ -129,9 +129,10 @@ Miscellaneous Options:
struct Args { struct Args {
cmd_daemon: bool, cmd_daemon: bool,
cmd_account: bool, cmd_account: bool,
cmd_new: bool,
cmd_list: bool,
arg_pid_file: String, arg_pid_file: String,
arg_enode: Vec<String>, arg_enode: Vec<String>,
arg_command: String,
flag_chain: String, flag_chain: String,
flag_testnet: bool, flag_testnet: bool,
flag_datadir: String, flag_datadir: String,
@ -342,17 +343,17 @@ impl Configuration {
.unwrap_or_else(|e| die!("Couldn't daemonize; {}", e)); .unwrap_or_else(|e| die!("Couldn't daemonize; {}", e));
} }
if self.args.cmd_account { if self.args.cmd_account {
self.execute_account_cli(&self.args.arg_command); self.execute_account_cli();
return; return;
} }
self.execute_client(); self.execute_client();
} }
fn execute_account_cli(&self, command: &str) { fn execute_account_cli(&self) {
use util::keys::store::SecretStore; use util::keys::store::SecretStore;
use rpassword::read_password; use rpassword::read_password;
let mut secret_store = SecretStore::new(); let mut secret_store = SecretStore::new();
if command == "new" { if self.args.cmd_new {
println!("Please note that password is NOT RECOVERABLE."); println!("Please note that password is NOT RECOVERABLE.");
println!("Type password: "); println!("Type password: ");
let password = read_password().unwrap(); let password = read_password().unwrap();
@ -367,7 +368,7 @@ impl Configuration {
println!("{:?}", new_address); println!("{:?}", new_address);
return; return;
} }
if command == "list" { if self.args.cmd_list {
println!("Known addresses:"); println!("Known addresses:");
for &(addr, _) in secret_store.accounts().unwrap().iter() { for &(addr, _) in secret_store.accounts().unwrap().iter() {
println!("{:?}", addr); println!("{:?}", addr);