Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Apply clippy feedback and add it to CI #585

Merged
garious merged 5 commits into from
Jul 12, 2018
Merged

Apply clippy feedback and add it to CI #585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
099d98a
Apply clippy feedback to CLI apps
garious Jul 11, 2018
3761d94
Apply most of clippy's feedback
garious Jul 11, 2018
c2ca123
Fix all remaining clippy warnings
garious Jul 12, 2018
7a0ead9
Add clippy to CI
garious Jul 12, 2018
ad1d08f
Use docker image's clippy
garious Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Apply clippy feedback to CLI apps
  • Loading branch information
@garious
garious committed Jul 12, 2018
commit 099d98a098465df6fe009a292946ea29bdb6110b
36 changes: 18 additions & 18 deletions src/bin/client-demo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ use std::time::Duration;
use std::time::Instant;

fn sample_tx_count(
exit: Arc<AtomicBool>,
maxes: Arc<RwLock<Vec<(f64, u64)>>>,
exit: &Arc<AtomicBool>,
maxes: &Arc<RwLock<Vec<(f64, u64)>>>,
first_count: u64,
v: NodeInfo,
v: &NodeInfo,
sample_period: u64,
) {
let mut client = mk_client(&v);
Expand Down Expand Up @@ -76,9 +76,9 @@ fn sample_tx_count(

fn generate_and_send_txs(
client: &mut ThinClient,
tx_clients: &Vec<ThinClient>,
tx_clients: &[ThinClient],
id: &Mint,
keypairs: &Vec<KeyPair>,
keypairs: &[KeyPair],
leader: &NodeInfo,
txs: i64,
last_id: &mut Hash,
Expand Down Expand Up @@ -199,15 +199,15 @@ fn main() {

let leader: NodeInfo;
if let Some(l) = matches.value_of("leader") {
leader = read_leader(l.to_string()).node_info;
leader = read_leader(l).node_info;
} else {
let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
leader = NodeInfo::new_leader(&server_addr);
};

let id: Mint;
if let Some(m) = matches.value_of("mint") {
id = read_mint(m.to_string()).expect("client mint");
id = read_mint(m).expect("client mint");
} else {
eprintln!("No mint found!");
exit(1);
Expand All @@ -225,12 +225,12 @@ fn main() {
time_sec = s.to_string().parse().expect("integer");
}

let mut drone_addr = leader.contact_info.tpu.clone();
let mut drone_addr = leader.contact_info.tpu;
drone_addr.set_port(9900);

let signal = Arc::new(AtomicBool::new(false));
let mut c_threads = vec![];
let validators = converge(&leader, signal.clone(), num_nodes, &mut c_threads);
let validators = converge(&leader, &signal.clone(), num_nodes, &mut c_threads);
assert_eq!(validators.len(), num_nodes);

let mut client = mk_client(&leader);
Expand All @@ -241,7 +241,7 @@ fn main() {
if starting_balance < txs {
let airdrop_amount = txs - starting_balance;
println!("Airdropping {:?} tokens", airdrop_amount);
let _airdrop = request_airdrop(&drone_addr, &id, airdrop_amount as u64).unwrap();
request_airdrop(&drone_addr, &id, airdrop_amount as u64).unwrap();
// TODO: return airdrop Result from Drone
sleep(Duration::from_millis(100));

Expand Down Expand Up @@ -282,13 +282,13 @@ fn main() {
Builder::new()
.name("solana-client-sample".to_string())
.spawn(move || {
sample_tx_count(exit, maxes, first_count, v, sample_period);
sample_tx_count(&exit, &maxes, first_count, &v, sample_period);
})
.unwrap()
})
.collect();

let clients = (0..threads).map(|_| mk_client(&leader)).collect();
let clients: Vec<_> = (0..threads).map(|_| mk_client(&leader)).collect();

// generate and send transactions for the specified duration
let time = Duration::new(time_sec / 2, 0);
Expand Down Expand Up @@ -385,7 +385,7 @@ fn spy_node() -> (NodeInfo, UdpSocket) {

fn converge(
leader: &NodeInfo,
exit: Arc<AtomicBool>,
exit: &Arc<AtomicBool>,
num_nodes: usize,
threads: &mut Vec<JoinHandle<()>>,
) -> Vec<NodeInfo> {
Expand Down Expand Up @@ -428,13 +428,13 @@ fn converge(
rv
}

fn read_leader(path: String) -> Config {
let file = File::open(path.clone()).expect(&format!("file not found: {}", path));
serde_json::from_reader(file).expect(&format!("failed to parse {}", path))
fn read_leader(path: &str) -> Config {
let file = File::open(path).unwrap_or_else(|_| panic!("file not found: {}", path));
serde_json::from_reader(file).unwrap_or_else(|_| panic!("failed to parse {}", path))
}

fn read_mint(path: String) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.clone())?;
fn read_mint(path: &str) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.to_string())?;
let mint = serde_json::from_reader(file)?;
Ok(mint)
}
Expand Down
14 changes: 7 additions & 7 deletions src/bin/drone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ fn main() {

let leader: NodeInfo;
if let Some(l) = matches.value_of("leader") {
leader = read_leader(l.to_string()).node_info;
leader = read_leader(l).node_info;
} else {
let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
leader = NodeInfo::new_leader(&server_addr);
};

let mint: Mint;
if let Some(m) = matches.value_of("mint") {
mint = read_mint(m.to_string()).expect("client mint");
mint = read_mint(m).expect("client mint");
} else {
eprintln!("No mint found!");
exit(1);
Expand Down Expand Up @@ -148,13 +148,13 @@ fn main() {
});
tokio::run(done);
}
fn read_leader(path: String) -> Config {
let file = File::open(path.clone()).expect(&format!("file not found: {}", path));
serde_json::from_reader(file).expect(&format!("failed to parse {}", path))
fn read_leader(path: &str) -> Config {
let file = File::open(path).unwrap_or_else(|_| panic!("file not found: {}", path));
serde_json::from_reader(file).unwrap_or_else(|_| panic!("failed to parse {}", path))
}

fn read_mint(path: String) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.clone())?;
fn read_mint(path: &str) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.to_string())?;
let mint = serde_json::from_reader(file)?;
Ok(mint)
}
2 changes: 1 addition & 1 deletion src/bin/fullnode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fn main() -> () {
None,
)
} else {
node.data.leader_id = node.data.id.clone();
node.data.leader_id = node.data.id;

let outfile = if let Some(o) = matches.value_of("output") {
OutFile::Path(o.to_string())
Expand Down
55 changes: 29 additions & 26 deletions src/bin/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ impl Default for WalletConfig {
fn default() -> WalletConfig {
let default_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
WalletConfig {
leader: NodeInfo::new_leader(&default_addr.clone()),
leader: NodeInfo::new_leader(&default_addr),
id: Mint::new(0),
drone_addr: default_addr.clone(),
drone_addr: default_addr,
command: WalletCommand::Balance,
}
}
Expand Down Expand Up @@ -143,34 +143,34 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {

let leader: NodeInfo;
if let Some(l) = matches.value_of("leader") {
leader = read_leader(l.to_string()).node_info;
leader = read_leader(l).node_info;
} else {
let server_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8000);
leader = NodeInfo::new_leader(&server_addr);
};

let id: Mint;
if let Some(m) = matches.value_of("mint") {
id = read_mint(m.to_string())?;
id = read_mint(m)?;
} else {
eprintln!("No mint found!");
exit(1);
};

let mut drone_addr = leader.contact_info.tpu.clone();
let mut drone_addr = leader.contact_info.tpu;
drone_addr.set_port(9900);

let command = match matches.subcommand() {
("airdrop", Some(airdrop_matches)) => {
let mut tokens: i64 = id.tokens;
if airdrop_matches.is_present("tokens") {
tokens = airdrop_matches.value_of("tokens").unwrap().parse()?;
}
let tokens = if airdrop_matches.is_present("tokens") {
airdrop_matches.value_of("tokens").unwrap().parse()?
} else {
id.tokens
};
Ok(WalletCommand::AirDrop(tokens))
}
("pay", Some(pay_matches)) => {
let to: PublicKey;
if pay_matches.is_present("to") {
let to = if pay_matches.is_present("to") {
let pubkey_vec = bs58::decode(pay_matches.value_of("to").unwrap())
.into_vec()
.expect("base58-encoded public key");
Expand All @@ -179,14 +179,17 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
display_actions();
Err(WalletError::BadParameter("Invalid public key".to_string()))?;
}
to = PublicKey::clone_from_slice(&pubkey_vec);
PublicKey::clone_from_slice(&pubkey_vec)
} else {
to = id.pubkey();
}
let mut tokens: i64 = id.tokens;
if pay_matches.is_present("tokens") {
tokens = pay_matches.value_of("tokens").unwrap().parse()?;
}
id.pubkey()
};

let tokens = if pay_matches.is_present("tokens") {
pay_matches.value_of("tokens").unwrap().parse()?
} else {
id.tokens
};

Ok(WalletCommand::Pay(tokens, to))
}
("confirm", Some(confirm_matches)) => {
Expand Down Expand Up @@ -250,7 +253,7 @@ fn process_command(
WalletCommand::AirDrop(tokens) => {
println!("Airdrop requested...");
println!("Airdropping {:?} tokens", tokens);
let _airdrop = request_airdrop(&config.drone_addr, &config.id, tokens as u64)?;
request_airdrop(&config.drone_addr, &config.id, tokens as u64)?;
// TODO: return airdrop Result from Drone
sleep(Duration::from_millis(100));
println!(
Expand All @@ -277,23 +280,23 @@ fn process_command(
}

fn display_actions() {
println!("");
println!();
println!("Commands:");
println!(" address Get your public key");
println!(" balance Get your account balance");
println!(" airdrop Request a batch of tokens");
println!(" pay Send tokens to a public key");
println!(" confirm Confirm your last payment by signature");
println!("");
println!();
}

fn read_leader(path: String) -> Config {
let file = File::open(path.clone()).expect(&format!("file not found: {}", path));
serde_json::from_reader(file).expect(&format!("failed to parse {}", path))
fn read_leader(path: &str) -> Config {
let file = File::open(path.to_string()).unwrap_or_else(|_| panic!("file not found: {}", path));
serde_json::from_reader(file).unwrap_or_else(|_| panic!("failed to parse {}", path))
}

fn read_mint(path: String) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.clone())?;
fn read_mint(path: &str) -> Result<Mint, Box<error::Error>> {
let file = File::open(path.to_string())?;
let mint = serde_json::from_reader(file)?;
Ok(mint)
}
Expand Down