Skip to content

Commit

Permalink
rustfmt
Browse files Browse the repository at this point in the history
  • Loading branch information
rlkelly committed May 2, 2018
1 parent d0151d2 commit cc6de60
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/accountant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
23 changes: 10 additions & 13 deletions src/accountant_skel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
Expand All @@ -803,10 +803,7 @@ mod bench {
drop(skel.historian.sender);
let entries: Vec<Entry> = 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);
}
Expand Down

0 comments on commit cc6de60

Please sign in to comment.