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

Remove some unwraps from parity/helpers (#3364)

Browse Source 
* Fixing no stdin

* Removing unwrap when reading passwords
This commit is contained in:
Tomasz Drwięga 2016-11-11 16:53:51 +01:00 committed by Gav Wood
parent 80606cdd7d
commit 4bf75d6f2f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
parity/helpers.rs
View File

@ -279,17 +279,18 @@ pub fn execute_upgrades(
/// Prompts user asking for password. /// Prompts user asking for password.
pub fn password_prompt() -> Result<String, String> { pub fn password_prompt() -> Result<String, String> {
use rpassword::read_password; use rpassword::read_password;
const STDIN_ERROR: &'static str = "Unable to ask for password on non-interactive terminal.";
println!("Please note that password is NOT RECOVERABLE."); println!("Please note that password is NOT RECOVERABLE.");
print!("Type password: "); print!("Type password: ");
flush_stdout(); flush_stdout();
let password = read_password().unwrap(); let password = try!(read_password().map_err(|_| STDIN_ERROR.to_owned()));
print!("Repeat password: "); print!("Repeat password: ");
flush_stdout(); flush_stdout();
let password_repeat = read_password().unwrap(); let password_repeat = try!(read_password().map_err(|_| STDIN_ERROR.to_owned()));
if password != password_repeat { if password != password_repeat {
return Err("Passwords do not match!".into()); return Err("Passwords do not match!".into());
@ -314,7 +315,7 @@ pub fn passwords_from_files(files: Vec<String>) -> Result<Vec<String>, String> {
let file = try!(File::open(filename).map_err(|_| format!("{} Unable to read password file. Ensure it exists and permissions are correct.", filename))); let file = try!(File::open(filename).map_err(|_| format!("{} Unable to read password file. Ensure it exists and permissions are correct.", filename)));
let reader = BufReader::new(&file); let reader = BufReader::new(&file);
let lines = reader.lines() let lines = reader.lines()
.map(|l| l.unwrap()) .filter_map(|l| l.ok())
.collect::<Vec<String>>(); .collect::<Vec<String>>();
Ok(lines) Ok(lines)
}).collect::<Result<Vec<Vec<String>>, String>>(); }).collect::<Result<Vec<Vec<String>>, String>>();