From c5cc91443e497f62bfaa457a00c54e74441b94ce Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Wed, 2 May 2018 15:54:53 -0600 Subject: [PATCH] Rename sender/receiver to input/output --- src/accountant_skel.rs | 16 ++++++++-------- src/bin/historian-demo.rs | 6 +++--- src/historian.rs | 36 ++++++++++++++++++------------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs index 65a0ddd097..d3141f7084 100644 --- a/src/accountant_skel.rs +++ b/src/accountant_skel.rs @@ -105,7 +105,7 @@ impl AccountantSkel { /// Process any Entry items that have been published by the Historian. pub fn sync(&mut self) -> Hash { - while let Ok(entry) = self.historian.receiver.try_recv() { + while let Ok(entry) = self.historian.output.try_recv() { self.last_id = entry.id; self.acc.register_entry_id(&self.last_id); writeln!(self.writer, "{}", serde_json::to_string(&entry).unwrap()).unwrap(); @@ -215,14 +215,14 @@ impl AccountantSkel { for result in self.acc.process_verified_transactions(trs) { if let Ok(tr) = result { self.historian - .sender + .input .send(Signal::Event(Event::Transaction(tr)))?; } } // Let validators know they should not attempt to process additional // transactions in parallel. - self.historian.sender.send(Signal::Tick)?; + self.historian.input.send(Signal::Tick)?; // Process the remaining requests serially. let rsps = reqs.into_iter() @@ -545,9 +545,9 @@ mod tests { assert!(skel.process_packets(req_vers).is_ok()); // Collect the ledger and feed it to a new accountant. - skel.historian.sender.send(Signal::Tick).unwrap(); - drop(skel.historian.sender); - let entries: Vec = skel.historian.receiver.iter().collect(); + skel.historian.input.send(Signal::Tick).unwrap(); + drop(skel.historian.input); + let entries: Vec = skel.historian.output.iter().collect(); // Assert the user holds one token, not two. If the server only output one // entry, then the second transaction will be rejected, because it drives @@ -800,8 +800,8 @@ mod bench { let tps = txs as f64 / sec; // Ensure that all transactions were successfully logged. - drop(skel.historian.sender); - let entries: Vec = skel.historian.receiver.iter().collect(); + drop(skel.historian.input); + let entries: Vec = skel.historian.output.iter().collect(); assert_eq!(entries.len(), 1); assert_eq!(entries[0].events.len(), txs as usize); diff --git a/src/bin/historian-demo.rs b/src/bin/historian-demo.rs index 306b8ffbaa..fe4180c457 100644 --- a/src/bin/historian-demo.rs +++ b/src/bin/historian-demo.rs @@ -17,7 +17,7 @@ fn create_ledger(hist: &Historian, seed: &Hash) -> Result<(), SendError> let keypair = KeyPair::new(); let tr = Transaction::new(&keypair, keypair.pubkey(), 42, *seed); let signal0 = Signal::Event(Event::Transaction(tr)); - hist.sender.send(signal0)?; + hist.input.send(signal0)?; sleep(Duration::from_millis(10)); Ok(()) } @@ -26,8 +26,8 @@ fn main() { let seed = Hash::default(); let hist = Historian::new(&seed, Some(10)); create_ledger(&hist, &seed).expect("send error"); - drop(hist.sender); - let entries: Vec = hist.receiver.iter().collect(); + drop(hist.input); + let entries: Vec = hist.output.iter().collect(); for entry in &entries { println!("{:?}", entry); } diff --git a/src/historian.rs b/src/historian.rs index 412027846f..970a75db0b 100644 --- a/src/historian.rs +++ b/src/historian.rs @@ -9,20 +9,20 @@ use std::thread::{spawn, JoinHandle}; use std::time::Instant; pub struct Historian { - pub sender: SyncSender, - pub receiver: Receiver, + pub input: SyncSender, + pub output: Receiver, pub thread_hdl: JoinHandle, } impl Historian { pub fn new(start_hash: &Hash, ms_per_tick: Option) -> Self { - let (sender, event_receiver) = sync_channel(10_000); - let (entry_sender, receiver) = sync_channel(10_000); + let (input, event_receiver) = sync_channel(10_000); + let (entry_sender, output) = sync_channel(10_000); let thread_hdl = Historian::create_recorder(*start_hash, ms_per_tick, event_receiver, entry_sender); Historian { - sender, - receiver, + input, + output, thread_hdl, } } @@ -62,21 +62,21 @@ mod tests { let zero = Hash::default(); let hist = Historian::new(&zero, None); - hist.sender.send(Signal::Tick).unwrap(); + hist.input.send(Signal::Tick).unwrap(); sleep(Duration::new(0, 1_000_000)); - hist.sender.send(Signal::Tick).unwrap(); + hist.input.send(Signal::Tick).unwrap(); sleep(Duration::new(0, 1_000_000)); - hist.sender.send(Signal::Tick).unwrap(); + hist.input.send(Signal::Tick).unwrap(); - let entry0 = hist.receiver.recv().unwrap(); - let entry1 = hist.receiver.recv().unwrap(); - let entry2 = hist.receiver.recv().unwrap(); + let entry0 = hist.output.recv().unwrap(); + let entry1 = hist.output.recv().unwrap(); + let entry2 = hist.output.recv().unwrap(); assert_eq!(entry0.num_hashes, 0); assert_eq!(entry1.num_hashes, 0); assert_eq!(entry2.num_hashes, 0); - drop(hist.sender); + drop(hist.input); assert_eq!( hist.thread_hdl.join().unwrap(), ExitReason::RecvDisconnected @@ -89,8 +89,8 @@ mod tests { fn test_historian_closed_sender() { let zero = Hash::default(); let hist = Historian::new(&zero, None); - drop(hist.receiver); - hist.sender.send(Signal::Tick).unwrap(); + drop(hist.output); + hist.input.send(Signal::Tick).unwrap(); assert_eq!( hist.thread_hdl.join().unwrap(), ExitReason::SendDisconnected @@ -102,9 +102,9 @@ mod tests { let zero = Hash::default(); let hist = Historian::new(&zero, Some(20)); sleep(Duration::from_millis(300)); - hist.sender.send(Signal::Tick).unwrap(); - drop(hist.sender); - let entries: Vec = hist.receiver.iter().collect(); + hist.input.send(Signal::Tick).unwrap(); + drop(hist.input); + let entries: Vec = hist.output.iter().collect(); assert!(entries.len() > 1); // Ensure the ID is not the seed.