From cc6de605ace8adad853cfefd2eba26dd6224940b Mon Sep 17 00:00:00 2001 From: Robert Kelly Date: Wed, 2 May 2018 12:21:20 -0400 Subject: [PATCH] rustfmt --- src/accountant.rs | 2 +- src/accountant_skel.rs | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/accountant.rs b/src/accountant.rs index 735798f9f7..49c5d2c883 100644 --- a/src/accountant.rs +++ b/src/accountant.rs @@ -14,8 +14,8 @@ use rayon::prelude::*; use signature::{KeyPair, PublicKey, Signature}; use std::collections::hash_map::Entry::Occupied; use std::collections::{HashMap, HashSet, VecDeque}; -use std::sync::atomic::{AtomicIsize, Ordering}; use std::result; +use std::sync::atomic::{AtomicIsize, Ordering}; use std::sync::RwLock; use transaction::Transaction; diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs index c5969fe097..65a0ddd097 100644 --- a/src/accountant_skel.rs +++ b/src/accountant_skel.rs @@ -487,14 +487,14 @@ mod tests { use std::time::Duration; use transaction::Transaction; - use subscribers::{Node, Subscribers}; - use streamer; - use std::sync::mpsc::channel; - use std::collections::VecDeque; - use hash::{hash, Hash}; - use event::Event; - use entry; use chrono::prelude::*; + use entry; + use event::Event; + use hash::{hash, Hash}; + use std::collections::VecDeque; + use std::sync::mpsc::channel; + use streamer; + use subscribers::{Node, Subscribers}; #[test] fn test_layout() { @@ -774,11 +774,11 @@ mod bench { // Seed the 'from' account. let rando0 = KeyPair::new(); let tr = Transaction::new(&mint.keypair(), rando0.pubkey(), 1_000, last_id); - let _ = acc.process_verified_transaction(&tr); + acc.process_verified_transaction(&tr).unwrap(); let rando1 = KeyPair::new(); let tr = Transaction::new(&rando0, rando1.pubkey(), 2, last_id); - let _ = acc.process_verified_transaction(&tr); + acc.process_verified_transaction(&tr).unwrap(); // Finally, return a transaction that's unique Transaction::new(&rando0, rando1.pubkey(), 1, last_id) @@ -803,10 +803,7 @@ mod bench { drop(skel.historian.sender); let entries: Vec = skel.historian.receiver.iter().collect(); assert_eq!(entries.len(), 1); - assert_eq!( - entries[0].events.len(), - txs as usize - ); + assert_eq!(entries[0].events.len(), txs as usize); println!("{} tps", tps); }