Recover from rebase

src/fullnode.rs

@@ -606,7 +606,6 @@ mod tests {
 
         let fullnode_config = FullnodeConfig::default();
         let ticks_per_slot = DEFAULT_TICKS_PER_SLOT;
-        let slots_per_epoch = DEFAULT_SLOTS_PER_EPOCH;
 
         // Create the leader and validator nodes
         let bootstrap_leader_keypair = Arc::new(Keypair::new());
@@ -689,12 +688,7 @@ mod tests {
         let validator_keypair = Arc::new(Keypair::new());
         let fullnode_config = FullnodeConfig::default();
         let (leader_node, validator_node, validator_ledger_path, ledger_initial_len, last_id) =
-            setup_leader_validator(
-                &leader_keypair,
-                &validator_keypair,
-                ticks_per_slot,
-                0,
-            );
+            setup_leader_validator(&leader_keypair, &validator_keypair, ticks_per_slot, 0);
 
         let leader_id = leader_keypair.pubkey();
         let validator_info = validator_node.info.clone();

src/replay_stage.rs

@@ -466,7 +466,6 @@ mod test {
     use crate::cluster_info::{ClusterInfo, Node};
     use crate::entry::create_ticks;
     use crate::entry::{next_entry_mut, Entry};
-    use crate::fullnode::make_active_set_entries;
     use crate::fullnode::new_banks_from_blocktree;
     use crate::replay_stage::ReplayStage;
     use solana_sdk::genesis_block::GenesisBlock;

tests/multinode.rs

@@ -1617,7 +1617,7 @@ fn test_fullnode_rotate(
 
     let mut leader_slot_height_of_next_rotation = 1;
 
-    if fullnode_config.leader_scheduler_config.ticks_per_slot == 1 {
+    if ticks_per_slot == 1 {
         // Add another tick to the ledger if the cluster has been configured for 1 ticks_per_slot.
         // The "pseudo-tick" entry0 currently added by bank::process_ledger cannot be rotated on
         // since it has no last id (so at 1 ticks_per_slot rotation must start at a tick_height of

tests/replicator.rs

@@ -238,8 +238,7 @@ fn test_replicator_startup_leader_hang() {
 
     let leader_ledger_path = "replicator_test_leader_ledger";
     let (genesis_block, _mint_keypair) = GenesisBlock::new(10_000);
-    let (replicator_ledger_path, _tick_height, _last_entry_height, _last_id, _last_entry_id) =
-        create_tmp_sample_blocktree("replicator_test_replicator_ledger", &genesis_block, 0);
+    let (replicator_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
 
     {
         let replicator_keypair = Keypair::new();
@@ -275,7 +274,7 @@ fn test_replicator_startup_ledger_hang() {
 
     let (genesis_block, _mint_keypair) =
         GenesisBlock::new_with_leader(100, leader_keypair.pubkey(), 42);
-    let (replicator_test_replicator_ledger, _last_id) = create_new_tmp_ledger!(&genesis_block);
+    let (replicator_ledger_path, _last_id) = create_new_tmp_ledger!(&genesis_block);
 
     info!("starting leader node");
     let leader_node = Node::new_localhost_with_pubkey(leader_keypair.pubkey());