diff --git a/src/bank.rs b/src/bank.rs index 3ab7866a25..8c75df625b 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -856,11 +856,11 @@ mod tests { fn create_sample_block(mint: &Mint, length: usize) -> impl Iterator { let mut entries = Vec::with_capacity(length); let mut hash = mint.last_id(); - let mut cur_hashes = 0; + let mut num_hashes = 0; for _ in 0..length { let keypair = KeyPair::new(); let tx = Transaction::new(&mint.keypair(), keypair.pubkey(), 1, hash); - let entry = Entry::new_mut(&mut hash, &mut cur_hashes, vec![tx], false); + let entry = Entry::new_mut(&mut hash, &mut num_hashes, vec![tx], false); entries.push(entry); } entries.into_iter() diff --git a/src/entry.rs b/src/entry.rs index 34076bc3f5..6abca08b63 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -54,11 +54,11 @@ impl Entry { /// Creates the next Entry `num_hashes` after `start_hash`. pub fn new( start_hash: &Hash, - cur_hashes: u64, + num_hashes: u64, transactions: Vec, has_more: bool, ) -> Self { - let num_hashes = cur_hashes + if transactions.is_empty() { 0 } else { 1 }; + let num_hashes = num_hashes + if transactions.is_empty() { 0 } else { 1 }; let id = next_hash(start_hash, 0, &transactions); let entry = Entry { num_hashes, @@ -123,13 +123,13 @@ impl Entry { /// Creates the next Tick Entry `num_hashes` after `start_hash`. pub fn new_mut( start_hash: &mut Hash, - cur_hashes: &mut u64, + num_hashes: &mut u64, transactions: Vec, has_more: bool, ) -> Self { - let entry = Self::new(start_hash, *cur_hashes, transactions, has_more); + let entry = Self::new(start_hash, *num_hashes, transactions, has_more); *start_hash = entry.id; - *cur_hashes = 0; + *num_hashes = 0; assert!(serialized_size(&entry).unwrap() <= BLOB_DATA_SIZE as u64); entry } diff --git a/src/ledger.rs b/src/ledger.rs index 523f192c1d..530a29a3db 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -427,16 +427,16 @@ pub fn reconstruct_entries_from_blobs(blobs: VecDeque) -> Result, ) -> Vec { // TODO: find a magic number that works better than | ? // V if transactions.is_empty() || transactions.len() == 1 { - vec![Entry::new_mut(start_hash, cur_hashes, transactions, false)] + vec![Entry::new_mut(start_hash, num_hashes, transactions, false)] } else { let mut start = 0; let mut entries = Vec::new(); @@ -478,7 +478,7 @@ pub fn next_entries_mut( } entries.push(Entry::new_mut( start_hash, - cur_hashes, + num_hashes, transactions[start..chunk_end].to_vec(), transactions.len() - chunk_end > 0, )); @@ -492,11 +492,11 @@ pub fn next_entries_mut( /// Creates the next Entries for given transactions pub fn next_entries( start_hash: &Hash, - cur_hashes: u64, + num_hashes: u64, transactions: Vec, ) -> Vec { let mut id = *start_hash; - let mut num_hashes = cur_hashes; + let mut num_hashes = num_hashes; next_entries_mut(&mut id, &mut num_hashes, transactions) }