Rebase once more

solana-labs · Oct 31, 2019 · 86545d6 · 86545d6
1 parent 9361e58
commit 86545d6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -795,8 +795,6 @@ impl ReplayStage {
         shred_index: usize,
         bank_progress: &mut ForkProgress,
     ) -> Result<()> {
-        datapoint_debug!("verify-batch-size", ("size", entries.len() as i64, i64));
-        let mut verify_total = Measure::start("verify_and_process_entries");
         let last_entry = &bank_progress.last_entry;
         let tick_hash_count = &mut bank_progress.tick_hash_count;
         let handle_block_error = move |block_error: BlockError| -> Result<()> {

diff --git a/ledger/tests/blocktree.rs b/ledger/tests/blocktree.rs
@@ -19,7 +19,7 @@ fn test_multiple_threads_insert_shred() {
         // with parent = slot 0
         let threads: Vec<_> = (0..num_threads)
             .map(|i| {
-                let entries = entry::create_ticks(1, Hash::default());
+                let entries = entry::create_ticks(1, 0, Hash::default());
                 let shreds = blocktree::entries_to_test_shreds(entries, i + 1, 0, false);
                 let blocktree_ = blocktree.clone();
                 Builder::new()