diff --git a/src/broadcast_service.rs b/src/broadcast_service.rs index b3724737f8..8c4b12f300 100644 --- a/src/broadcast_service.rs +++ b/src/broadcast_service.rs @@ -376,10 +376,7 @@ mod test { max_tick_height, ); - let ticks = create_ticks( - (max_tick_height - start_tick_height) as usize, - Hash::default(), - ); + let ticks = create_ticks(max_tick_height - start_tick_height, Hash::default()); for (i, mut tick) in ticks.into_iter().enumerate() { // Simulate the tick heights generated in poh.rs tick.tick_height = start_tick_height + i as u64 + 1; diff --git a/src/db_ledger.rs b/src/db_ledger.rs index e3ff089d25..0f64de34e7 100644 --- a/src/db_ledger.rs +++ b/src/db_ledger.rs @@ -895,7 +895,7 @@ pub fn create_tmp_genesis( pub fn create_tmp_sample_ledger( name: &str, num_tokens: u64, - num_ending_ticks: usize, + num_ending_ticks: u64, bootstrap_leader_id: Pubkey, bootstrap_leader_tokens: u64, ) -> (GenesisBlock, Keypair, String, Vec) { diff --git a/src/entry.rs b/src/entry.rs index 5dd701d3bc..318dfccbd6 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -386,9 +386,9 @@ pub fn next_entries( next_entries_mut(&mut id, &mut num_hashes, transactions) } -pub fn create_ticks(num_ticks: usize, mut hash: Hash) -> Vec { +pub fn create_ticks(num_ticks: u64, mut hash: Hash) -> Vec { let mut ticks = Vec::with_capacity(num_ticks as usize); - for _ in 0..num_ticks as u64 { + for _ in 0..num_ticks { let new_tick = Entry::new(&hash, 0, 1, vec![]); hash = new_tick.id; ticks.push(new_tick); @@ -453,7 +453,7 @@ pub fn make_consecutive_blobs( start_hash: Hash, addr: &std::net::SocketAddr, ) -> Vec { - let entries = create_ticks(num_blobs_to_make as usize, start_hash); + let entries = create_ticks(num_blobs_to_make, start_hash); let blobs = entries.to_shared_blobs(); let mut index = start_height; diff --git a/src/leader_scheduler.rs b/src/leader_scheduler.rs index 76424950f0..fce4b1bfc5 100644 --- a/src/leader_scheduler.rs +++ b/src/leader_scheduler.rs @@ -485,7 +485,7 @@ pub fn make_active_set_entries( token_source: &Keypair, last_entry_id: &Hash, last_tick_id: &Hash, - num_ending_ticks: usize, + num_ending_ticks: u64, ) -> (Vec, VoteSignerProxy) { // 1) Create transfer token entry let transfer_tx =