Style rewrite

rpc_cli/src/lib.rs

@@ -15,7 +15,10 @@ use std::fs::File;
 
 use futures::Future;
 
-fn sign_interactive(signer: &mut SignerRpc, password: &str, request: ConfirmationRequest)
+fn sign_interactive(
+	signer: &mut SignerRpc,
+	password: &str,
+	request: ConfirmationRequest)
 {
 	print!("\n{}\nSign this transaction? (y)es/(N)o/(r)eject: ", request);
 	let _ = stdout().flush();
@@ -39,7 +42,9 @@ fn sign_interactive(signer: &mut SignerRpc, password: &str, request: Confirmatio
 	}
 }
 
-fn sign_transactions(signer: &mut SignerRpc, password: String) -> Result<String, String> {
+fn sign_transactions(
+	signer: &mut SignerRpc, password: String
+) -> Result<String, String> {
 	try!(signer.requests_to_confirm().map(|reqs| {
 		match reqs {
 			Ok(ref reqs) if reqs.is_empty() => {
@@ -82,9 +87,9 @@ fn list_transactions(signer: &mut SignerRpc) -> Result<String, String> {
 	}).wait())
 }
 
-fn sign_transaction(signer: &mut SignerRpc,
+fn sign_transaction(
-					id: U256,
+	signer: &mut SignerRpc, id: U256, password: &str
-					password: &str) -> Result<String, String> {
+) -> Result<String, String> {
 	try!(signer.confirm_request(id, None, password).map(|res| {
 		match res {
 			Ok(u) => Ok(format!("Signed transaction id: {:#x}", u)),
@@ -95,8 +100,9 @@ fn sign_transaction(signer: &mut SignerRpc,
 	}).wait())
 }
 
-fn reject_transaction(signer: &mut SignerRpc,
+fn reject_transaction(
-					  id: U256) -> Result<String, String> {
+	signer: &mut SignerRpc, id: U256) -> Result<String, String>
+{
 	try!(signer.reject_request(id).map(|res| {
 		match res {
 			Ok(true) => Ok(format!("Rejected transaction id {:#x}", id)),
@@ -110,27 +116,34 @@ fn reject_transaction(signer: &mut SignerRpc,
 
 // cmds
 
-pub fn cmd_signer_list(signerport: u16,
+pub fn cmd_signer_list(
-					   authfile: PathBuf) -> Result<String, String> {
+	signerport: u16, authfile: PathBuf
-	let mut signer = try!(SignerRpc::new(&format!("ws://127.0.0.1:{}", signerport), &authfile).map_err(|err| {
+) -> Result<String, String> {
+	let addr = &format!("ws://127.0.0.1:{}", signerport);
+	let mut signer = try!(SignerRpc::new(addr, &authfile));
+	signer.map_err(|err| {
 		format!("{:?}", err)
 	}));
 	list_transactions(&mut signer)
 }
 
-pub fn cmd_signer_reject(id: Option<usize>, signerport: u16,
+pub fn cmd_signer_reject(
-						 authfile: PathBuf) -> Result<String, String> {
+	id: Option<usize>, signerport: u16, authfile: PathBuf
+) -> Result<String, String> {
 	let id = try!(id.ok_or(format!("id required for signer reject")));
-	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)
 	}));
 	reject_transaction(&mut signer, U256::from(id))
 }
 
-pub fn cmd_signer_sign(id: Option<usize>,
+pub fn cmd_signer_sign(
-					   pwfile: Option<PathBuf>,
+	id: Option<usize>,
-					   signerport: u16,
+	pwfile: Option<PathBuf>,
-					   authfile: PathBuf) -> Result<String, String> {
+	signerport: u16,
+	authfile: PathBuf
+) -> Result<String, String> {
 	let password;
 	match pwfile {
 		Some(pwfile) => {

rpc_client/src/client.rs

@@ -46,10 +46,11 @@ struct RpcHandler {
 }
 
 impl RpcHandler {
-	fn new(out: Sender,
+	fn new(
-		   auth_code: String,
+		out: Sender,
-		   complete: Complete<Result<Rpc, RpcError>>)
+		auth_code: String,
-		   -> Self {
+		complete: Complete<Result<Rpc, RpcError>>
+	) -> Self {
 		RpcHandler {
 			out: Some(out),
 			auth_code: auth_code,
@@ -169,8 +170,9 @@ impl Rpc {
 		rpc
 	}
 	/// Non-blocking, returns a future
-	pub fn connect(url: &str, authpath: &PathBuf)
+	pub fn connect(
-			   -> BoxFuture<Result<Self, RpcError>, Canceled> {
+		url: &str, authpath: &PathBuf
+	) -> BoxFuture<Result<Self, RpcError>, Canceled> {
 		let (c, p) = oneshot::<Result<Self, RpcError>>();
 		match get_authcode(authpath) {
 			Err(e) => return done(Ok(Err(e))).boxed(),
@@ -203,8 +205,9 @@ impl Rpc {
 		}
 	}
 	/// Non-blocking, returns a future of the request response
-	pub fn request<T>(&mut self, method: &'static str, params: Vec<JsonValue>)
+	pub fn request<T>(
-			   -> BoxFuture<Result<T, RpcError>, Canceled>
+		&mut self, method: &'static str, params: Vec<JsonValue>
+	) -> BoxFuture<Result<T, RpcError>, Canceled>
 		where T: Deserialize + Send + Sized {
 
 		let (c, p) = oneshot::<Result<JsonValue, RpcError>>();

rpc_client/src/signer_client.rs

@@ -19,11 +19,12 @@ impl SignerRpc {
 	{
 		self.rpc.request("personal_requestsToConfirm", vec![])
 	}
-	pub fn confirm_request(&mut self,
+	pub fn confirm_request(
-						   id: U256,
+		&mut self,
-						   new_gas_price: Option<U256>,
+		id: U256,
-						   pwd: &str) ->
+		new_gas_price: Option<U256>,
-		BoxFuture<Result<U256, RpcError>, Canceled>
+		pwd: &str
+	) -> BoxFuture<Result<U256, RpcError>, Canceled>
 	{
 		self.rpc.request("personal_confirmRequest", vec![
 			to_value(&format!("{:#x}", id)),