Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-02-01 03:12:15 +00:00
Code Issues Projects Releases Wiki Activity

remove use and make name explicit where used (#5)

Browse Source 
* remove use and make name explicit where used

This commit suggests a readability enhancement.
Removing the "use" directive, and making the
rustyline::Editor usage explicit at the call site,
allows the reader to look in one less place.

* make ReadlineError explicit

* mv clap::{Arg, App} adjacent to use

* remove unused {}

* make Duration explicit, remove use
This commit is contained in:
Za Wilcox 2019-10-16 21:20:03 -06:00 committed by adityapk00
parent aece2860a3
commit 28aacf3f50
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -1,7 +1,6 @@
use std::io::{Result, Error, ErrorKind}; use std::io::{Result, Error, ErrorKind};
use std::sync::{Arc}; use std::sync::Arc;
use std::sync::mpsc::{channel, Sender, Receiver}; use std::sync::mpsc::{channel, Sender, Receiver};
use std::time::Duration;
use zecwalletlitelib::{commands, use zecwalletlitelib::{commands,
lightclient::{self, LightClient, LightClientConfig}, lightclient::{self, LightClient, LightClientConfig},
@ -18,10 +17,6 @@ use log4rs::append::rolling_file::policy::compound::{
roll::fixed_window::FixedWindowRoller, roll::fixed_window::FixedWindowRoller,
}; };
use rustyline::error::ReadlineError;
use rustyline::Editor;
use clap::{Arg, App};
/// Build the Logging config /// Build the Logging config
@ -57,6 +52,7 @@ fn get_log_config(config: &LightClientConfig) -> Result<Config> {
pub fn main() { pub fn main() {
// Get command line arguments // Get command line arguments
use clap::{Arg, App};
let matches = App::new("Zecwallet CLI") let matches = App::new("Zecwallet CLI")
.version("1.0.0") .version("1.0.0")
.arg(Arg::with_name("seed") .arg(Arg::with_name("seed")
@ -183,7 +179,7 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option<String>, first_sync:
fn start_interactive(command_tx: Sender<(String, Vec<String>)>, resp_rx: Receiver<String>) { fn start_interactive(command_tx: Sender<(String, Vec<String>)>, resp_rx: Receiver<String>) {
// `()` can be used when no completer is required // `()` can be used when no completer is required
let mut rl = Editor::<()>::new(); let mut rl = rustyline::Editor::<()>::new();
println!("Ready!"); println!("Ready!");
@ -235,13 +231,13 @@ fn start_interactive(command_tx: Sender<(String, Vec<String>)>, resp_rx: Receive
break; break;
} }
}, },
Err(ReadlineError::Interrupted) => { Err(rustyline::error::ReadlineError::Interrupted) => {
println!("CTRL-C"); println!("CTRL-C");
info!("CTRL-C"); info!("CTRL-C");
println!("{}", send_command("save".to_string(), vec![])); println!("{}", send_command("save".to_string(), vec![]));
break break
}, },
Err(ReadlineError::Eof) => { Err(rustyline::error::ReadlineError::Eof) => {
println!("CTRL-D"); println!("CTRL-D");
info!("CTRL-D"); info!("CTRL-D");
println!("{}", send_command("save".to_string(), vec![])); println!("{}", send_command("save".to_string(), vec![]));
@ -263,7 +259,7 @@ fn command_loop(lightclient: Arc<LightClient>) -> (Sender<(String, Vec<String>)>
let lc = lightclient.clone(); let lc = lightclient.clone();
std::thread::spawn(move || { std::thread::spawn(move || {
loop { loop {
match command_rx.recv_timeout(Duration::from_secs(5 * 60)) { match command_rx.recv_timeout(std::time::Duration::from_secs(5 * 60)) {
Ok((cmd, args)) => { Ok((cmd, args)) => {
let args = args.iter().map(|s| s.as_ref()).collect(); let args = args.iter().map(|s| s.as_ref()).collect();