From 327ee1dae8904d1d2a8e4dd9dca85acb6d3a00ad Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 15 Jun 2018 15:27:06 -0600 Subject: [PATCH] Apply feedback from @aeyakovenko --- src/replicate_stage.rs | 6 +++--- src/tvu.rs | 42 +++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/replicate_stage.rs b/src/replicate_stage.rs index 994e2285db..fad5f036de 100644 --- a/src/replicate_stage.rs +++ b/src/replicate_stage.rs @@ -15,14 +15,14 @@ pub struct ReplicateStage { } impl ReplicateStage { - /// Process verified blobs, already in order + /// Process entry blobs, already in order fn replicate_requests( bank: &Arc, - verified_receiver: &streamer::BlobReceiver, + blob_receiver: &streamer::BlobReceiver, blob_recycler: &packet::BlobRecycler, ) -> Result<()> { let timer = Duration::new(1, 0); - let blobs = verified_receiver.recv_timeout(timer)?; + let blobs = blob_receiver.recv_timeout(timer)?; let entries = ledger::reconstruct_entries_from_blobs(&blobs); let res = bank.process_entries(entries); if res.is_err() { diff --git a/src/tvu.rs b/src/tvu.rs index 28e360629d..1d4bab5e07 100644 --- a/src/tvu.rs +++ b/src/tvu.rs @@ -2,27 +2,27 @@ //! 3-stage transaction validation pipeline in software. //! //! ```text -//! .----------------------------------------. -//! | TVU | -//! | | -//! | | -//! | | -//! | | -//! | .-------. .--------. .-----------. | -//! .--------. | | Blob | | Window | | Replicate | | .------------. -//! | Leader |--->| Fetch |->| Stage |->| Stage |---->| Validators | -//! `--------` | | Stage | | | | | | `------------` -//! | `-------` `----+---` `----+------` | -//! | | | | -//! | | | | -//! | | | | -//! | | | | -//! `------------------|-----------|---------` -//! | | -//! v v -//! .--------. .------. -//! | Window | | Bank | -//! `--------` `------` +//! .------------------------------------------. +//! | TVU | +//! | | +//! | | .------------. +//! | .------------------------>| Validators | +//! | .-------. | | `------------` +//! .--------. | | | .----+---. .-----------. | +//! | Leader |--------->| Blob | | Window | | Replicate | | +//! `--------` | | Fetch |-->| Stage |-->| Stage | | +//! .------------. | | Stage | | | | | | +//! | Validators |----->| | `--------` `----+------` | +//! `------------` | `-------` | | +//! | | | +//! | | | +//! | | | +//! `--------------------------------|---------` +//! | +//! v +//! .------. +//! | Bank | +//! `------` //! ``` // // TODO: @aeyakovenko, these comments no longer refect the code in this module: