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

Rebased on master

Browse Source
This commit is contained in:
Kristoffer Ström
2016-11-02 17:14:05 +01:00
committed by arkpar
parent 6552319074
commit 0e516162c3
6 changed files with 142 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpc_cli/src/lib.rs
View File

@@ -18,8 +18,8 @@ use futures::Future;
fn sign_interactive(
signer: &mut SignerRpc,
password: &str,
request: ConfirmationRequest)
{
request: ConfirmationRequest
) {
print!("\n{}\nSign this transaction? (y)es/(N)o/(r)eject: ", request);
let _ = stdout().flush();
match BufReader::new(stdin()).lines().next() {
@@ -43,7 +43,8 @@ fn sign_interactive(
}
fn sign_transactions(
signer: &mut SignerRpc, password: String
signer: &mut SignerRpc,
password: String
) -> Result<String, String> {
try!(signer.requests_to_confirm().map(|reqs| {
match reqs {
@@ -120,8 +121,7 @@ pub fn cmd_signer_list(
signerport: u16, authfile: PathBuf
) -> Result<String, String> {
let addr = &format!("ws://127.0.0.1:{}", signerport);
let mut signer = try!(SignerRpc::new(addr, &authfile));
signer.map_err(|err| {
let mut signer = try!(SignerRpc::new(addr, &authfile).map_err(|err| {
format!("{:?}", err)
}));
list_transactions(&mut signer)
@@ -154,7 +154,8 @@ pub fn cmd_signer_sign(
_ => return Err(format!("No password in file"))
}
},
Err(e) => return Err(format!("Could not open password file: {}", e))
Err(e) =>
return Err(format!("Could not open password file: {}", e))
}
}
None => {
@@ -165,7 +166,8 @@ pub fn cmd_signer_sign(
}
}
let mut signer = try!(SignerRpc::new(&format!("ws://127.0.0.1:{}", signerport), &authfile).map_err(|err| {
let addr = &format!("ws://127.0.0.1:{}", signerport);
let mut signer = try!(SignerRpc::new(addr, &authfile).map_err(|err| {
format!("{:?}", err)
}));