blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reposition parameters

This commit is contained in:
Greg Fitzgerald 2018-09-07 12:15:03 -06:00
parent f7ea95aed1
commit 9693de1867
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.rs
View File

@ -192,6 +192,7 @@ fn add_block_to_retransmit_queue(
} }
fn retransmit_all_leader_blocks( fn retransmit_all_leader_blocks(
window: &SharedWindow,
maybe_leader: Option<NodeInfo>, maybe_leader: Option<NodeInfo>,
dq: &[SharedBlob], dq: &[SharedBlob],
id: &Pubkey, id: &Pubkey,
@ -199,7 +200,6 @@ fn retransmit_all_leader_blocks(
consumed: u64, consumed: u64,
received: u64, received: u64,
retransmit: &BlobSender, retransmit: &BlobSender,
window: &SharedWindow,
pending_retransmits: &mut bool, pending_retransmits: &mut bool,
) -> Result<()> { ) -> Result<()> {
let mut retransmit_queue: Vec<SharedBlob> = Vec::new(); let mut retransmit_queue: Vec<SharedBlob> = Vec::new();
@ -390,8 +390,8 @@ fn blob_idx_in_window(id: &Pubkey, pix: u64, consumed: u64, received: &mut u64)
#[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
fn recv_window( fn recv_window(
id: &Pubkey,
window: &SharedWindow, window: &SharedWindow,
id: &Pubkey,
crdt: &Arc<RwLock<Crdt>>, crdt: &Arc<RwLock<Crdt>>,
recycler: &BlobRecycler, recycler: &BlobRecycler,
consumed: &mut u64, consumed: &mut u64,
@ -423,6 +423,7 @@ fn recv_window(
); );
retransmit_all_leader_blocks( retransmit_all_leader_blocks(
window,
maybe_leader, maybe_leader,
&dq, &dq,
id, id,
@ -430,7 +431,6 @@ fn recv_window(
*consumed, *consumed,
*received, *received,
retransmit, retransmit,
window,
pending_retransmits, pending_retransmits,
)?; )?;
@ -622,8 +622,8 @@ pub fn window(
trace!("{}: RECV_WINDOW started", id); trace!("{}: RECV_WINDOW started", id);
loop { loop {
if let Err(e) = recv_window( if let Err(e) = recv_window(
&id,
&window, &window,
&id,
&crdt, &crdt,
&recycler, &recycler,
&mut consumed, &mut consumed,