From 517d08c6372b20c62fe689ea21d3cb6a9bf28e19 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 29 Jun 2018 10:30:09 -0600 Subject: [PATCH] Cleanup --- src/bank.rs | 10 +++++----- src/bin/wallet.rs | 2 +- src/request_processor.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bank.rs b/src/bank.rs index 563d7f67a..e7a030182 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -434,16 +434,16 @@ impl Bank { self.transaction_count.load(Ordering::Relaxed) } - pub fn check_signature(&self, signature: &Signature) -> bool { + pub fn has_signature(&self, signature: &Signature) -> bool { let last_ids_sigs = self.last_ids_sigs .read() .expect("'last_ids_sigs' read lock"); for (_hash, signatures) in last_ids_sigs.iter() { - if let Some(_sig) = signatures.get(signature) { + if signatures.contains(signature) { return true; } } - return false; + false } } @@ -634,13 +634,13 @@ mod tests { } #[test] - fn test_check_signature() { + fn test_has_signature() { let mint = Mint::new(1); let bank = Bank::new(&mint); let sig = Signature::default(); bank.reserve_signature_with_last_id(&sig, &mint.last_id()) .expect("reserve signature"); - assert!(bank.check_signature(&sig)); + assert!(bank.has_signature(&sig)); } #[test] diff --git a/src/bin/wallet.rs b/src/bin/wallet.rs index 03b4460c4..1d85ecee2 100644 --- a/src/bin/wallet.rs +++ b/src/bin/wallet.rs @@ -69,7 +69,7 @@ fn main() -> io::Result<()> { let id = if matches.opt_present("m") { read_mint(matches.opt_str("m").unwrap()) } else { - println!("No mint found!"); + eprintln!("No mint found!"); exit(1); }; diff --git a/src/request_processor.rs b/src/request_processor.rs index a247840a6..f55bdf37e 100644 --- a/src/request_processor.rs +++ b/src/request_processor.rs @@ -41,7 +41,7 @@ impl RequestProcessor { Some(rsp) } Request::GetSignature { signature } => { - let signature_status = self.bank.check_signature(&signature); + let signature_status = self.bank.has_signature(&signature); let rsp = (Response::SignatureStatus { signature_status }, rsp_addr); info!("Response::Signature {:?}", rsp); Some(rsp)