diff --git a/src/blocktree.rs b/src/blocktree.rs index 528da00b16..1f88837554 100644 --- a/src/blocktree.rs +++ b/src/blocktree.rs @@ -413,7 +413,7 @@ impl Blocktree { Ok((blocktree, signal_sender, signal_receiver)) } - pub fn open_config(ledger_path: &str, config: BlocktreeConfig) -> Result { + pub fn open_config(ledger_path: &str, config: &BlocktreeConfig) -> Result { let mut blocktree = Self::open(ledger_path)?; blocktree.ticks_per_slot = config.ticks_per_slot; Ok(blocktree) @@ -421,7 +421,7 @@ impl Blocktree { pub fn open_with_config_signal( ledger_path: &str, - config: BlocktreeConfig, + config: &BlocktreeConfig, ) -> Result<(Self, SyncSender, Receiver)> { let mut blocktree = Self::open(ledger_path)?; let (signal_sender, signal_receiver) = sync_channel(1); @@ -1872,7 +1872,7 @@ mod tests { let ledger_path = get_tmp_ledger_path("test_new_blobs_signal"); let ticks_per_slot = 10; let config = BlocktreeConfig::new(ticks_per_slot); - let (ledger, _, recvr) = Blocktree::open_with_config_signal(&ledger_path, config).unwrap(); + let (ledger, _, recvr) = Blocktree::open_with_config_signal(&ledger_path, &config).unwrap(); let ledger = Arc::new(ledger); // Create ticks for slot 0 @@ -1979,7 +1979,7 @@ mod tests { { let ticks_per_slot = 2; let config = BlocktreeConfig::new(ticks_per_slot); - let blocktree = Blocktree::open_config(&blocktree_path, config).unwrap(); + let blocktree = Blocktree::open_config(&blocktree_path, &config).unwrap(); let entries = create_ticks(6, Hash::default()); let mut blobs = entries.to_blobs(); diff --git a/src/fullnode.rs b/src/fullnode.rs index 6e7391ebe3..24099dfa48 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -131,7 +131,7 @@ impl Fullnode { ledger_signal_receiver, ) = new_bank_from_ledger( ledger_path, - config.ledger_config(), + &config.ledger_config(), &config.leader_scheduler_config, ); @@ -469,7 +469,7 @@ impl Fullnode { pub fn new_bank_from_ledger( ledger_path: &str, - ledger_config: BlocktreeConfig, + ledger_config: &BlocktreeConfig, leader_scheduler_config: &LeaderSchedulerConfig, ) -> (Bank, u64, Hash, Blocktree, SyncSender, Receiver) { let (blocktree, ledger_signal_sender, ledger_signal_receiver) = @@ -832,7 +832,7 @@ mod tests { validator_exit(); let (bank, entry_height, _, _, _, _) = new_bank_from_ledger( &validator_ledger_path, - BlocktreeConfig::default(), + &BlocktreeConfig::default(), &LeaderSchedulerConfig::default(), ); diff --git a/src/repair_service.rs b/src/repair_service.rs index c6ced41cfe..f01dc4b0f7 100644 --- a/src/repair_service.rs +++ b/src/repair_service.rs @@ -219,7 +219,7 @@ mod test { { let num_ticks_per_slot = 1; let blocktree_config = BlocktreeConfig::new(num_ticks_per_slot); - let blocktree = Blocktree::open_config(&blocktree_path, blocktree_config).unwrap(); + let blocktree = Blocktree::open_config(&blocktree_path, &blocktree_config).unwrap(); let mut blobs = create_ticks(1, Hash::default()).to_blobs(); blobs[0].set_index(0); @@ -268,7 +268,7 @@ mod test { { let num_ticks_per_slot = 10; let blocktree_config = BlocktreeConfig::new(num_ticks_per_slot); - let blocktree = Blocktree::open_config(&blocktree_path, blocktree_config).unwrap(); + let blocktree = Blocktree::open_config(&blocktree_path, &blocktree_config).unwrap(); let mut blobs = make_tiny_test_entries(1).to_blobs(); blobs[0].set_index(1); @@ -294,7 +294,7 @@ mod test { { let num_ticks_per_slot = 10; let blocktree_config = BlocktreeConfig::new(num_ticks_per_slot); - let blocktree = Blocktree::open_config(&blocktree_path, blocktree_config).unwrap(); + let blocktree = Blocktree::open_config(&blocktree_path, &blocktree_config).unwrap(); let num_entries_per_slot = 10; let num_slots = 2; diff --git a/src/replay_stage.rs b/src/replay_stage.rs index 6aedf35dc1..468e0929a9 100644 --- a/src/replay_stage.rs +++ b/src/replay_stage.rs @@ -445,7 +445,7 @@ mod test { // Set up the bank let blocktree_config = BlocktreeConfig::new(ticks_per_slot); let (bank, _entry_height, last_entry_id, blocktree, l_sender, l_receiver) = - new_bank_from_ledger(&my_ledger_path, blocktree_config, &leader_scheduler_config); + new_bank_from_ledger(&my_ledger_path, &blocktree_config, &leader_scheduler_config); // Set up the replay stage let (rotation_sender, rotation_receiver) = channel(); @@ -554,7 +554,7 @@ mod test { let (bank, entry_height, last_entry_id, blocktree, l_sender, l_receiver) = new_bank_from_ledger( &my_ledger_path, - BlocktreeConfig::default(), + &BlocktreeConfig::default(), &LeaderSchedulerConfig::default(), ); @@ -675,7 +675,7 @@ mod test { { let blocktree_config = BlocktreeConfig::new(ticks_per_slot); let (bank, _entry_height, last_entry_id, blocktree, l_sender, l_receiver) = - new_bank_from_ledger(&my_ledger_path, blocktree_config, &leader_scheduler_config); + new_bank_from_ledger(&my_ledger_path, &blocktree_config, &leader_scheduler_config); let meta = blocktree .meta(0) diff --git a/tests/multinode.rs b/tests/multinode.rs index a37cdb2dfe..dda62e9ec9 100644 --- a/tests/multinode.rs +++ b/tests/multinode.rs @@ -985,7 +985,7 @@ fn test_leader_to_validator_transition() { info!("Check the ledger to make sure it's the right height..."); let bank = new_bank_from_ledger( &leader_ledger_path, - BlocktreeConfig::default(), + &BlocktreeConfig::default(), &LeaderSchedulerConfig::default(), ) .0; @@ -1778,7 +1778,7 @@ fn test_fullnode_rotate(ticks_per_slot: u64, slots_per_epoch: u64) { let blocktree = solana::blocktree::Blocktree::open_config( &leader_ledger_path, - fullnode_config.ledger_config(), + &fullnode_config.ledger_config(), ) .unwrap(); blocktree