gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use consistent variable naming for DropBankService

Browse Source
This commit is contained in:
Michael Vines
2022-03-15 13:28:40 -07:00
parent d44f3d7216
commit dbc62f2e28
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/replay_stage.rs
View File

@ -1734,7 +1734,7 @@ impl ReplayStage {
replay_timing: &mut ReplayTiming, replay_timing: &mut ReplayTiming,
voting_sender: &Sender<VoteOp>, voting_sender: &Sender<VoteOp>,
epoch_slots_frozen_slots: &mut EpochSlotsFrozenSlots, epoch_slots_frozen_slots: &mut EpochSlotsFrozenSlots,
bank_drop_sender: &Sender<Vec<Arc<Bank>>>, drop_bank_sender: &Sender<Vec<Arc<Bank>>>,
wait_to_vote_slot: Option<Slot>, wait_to_vote_slot: Option<Slot>,
) { ) {
if bank.is_empty() { if bank.is_empty() {
@ -1786,7 +1786,7 @@ impl ReplayStage {
has_new_vote_been_rooted, has_new_vote_been_rooted,
vote_signatures, vote_signatures,
epoch_slots_frozen_slots, epoch_slots_frozen_slots,
bank_drop_sender, drop_bank_sender,
); );
rpc_subscriptions.notify_roots(rooted_slots); rpc_subscriptions.notify_roots(rooted_slots);
if let Some(sender) = bank_notification_sender { if let Some(sender) = bank_notification_sender {
@ -2924,14 +2924,14 @@ impl ReplayStage {
has_new_vote_been_rooted: &mut bool, has_new_vote_been_rooted: &mut bool,
voted_signatures: &mut Vec<Signature>, voted_signatures: &mut Vec<Signature>,
epoch_slots_frozen_slots: &mut EpochSlotsFrozenSlots, epoch_slots_frozen_slots: &mut EpochSlotsFrozenSlots,
bank_drop_sender: &Sender<Vec<Arc<Bank>>>, drop_bank_sender: &Sender<Vec<Arc<Bank>>>,
) { ) {
let removed_banks = bank_forks.write().unwrap().set_root( let removed_banks = bank_forks.write().unwrap().set_root(
new_root, new_root,
accounts_background_request_sender, accounts_background_request_sender,
highest_confirmed_root, highest_confirmed_root,
); );
bank_drop_sender drop_bank_sender
.send(removed_banks) .send(removed_banks)
.unwrap_or_else(|err| warn!("bank drop failed: {:?}", err)); .unwrap_or_else(|err| warn!("bank drop failed: {:?}", err));
@ -3442,7 +3442,7 @@ pub mod tests {
.into_iter() .into_iter()
.map(|slot| (slot, Hash::default())) .map(|slot| (slot, Hash::default()))
.collect(); .collect();
let (bank_drop_sender, _bank_drop_receiver) = unbounded(); let (drop_bank_sender, _drop_bank_receiver) = unbounded();
ReplayStage::handle_new_root( ReplayStage::handle_new_root(
root, root,
&bank_forks, &bank_forks,
@ -3456,7 +3456,7 @@ pub mod tests {
&mut true, &mut true,
&mut Vec::new(), &mut Vec::new(),
&mut epoch_slots_frozen_slots, &mut epoch_slots_frozen_slots,
&bank_drop_sender, &drop_bank_sender,
); );
assert_eq!(bank_forks.read().unwrap().root(), root); assert_eq!(bank_forks.read().unwrap().root(), root);
assert_eq!(progress.len(), 1); assert_eq!(progress.len(), 1);
@ -3523,7 +3523,7 @@ pub mod tests {
for i in 0..=root { for i in 0..=root {
progress.insert(i, ForkProgress::new(Hash::default(), None, None, 0, 0)); progress.insert(i, ForkProgress::new(Hash::default(), None, None, 0, 0));
} }
let (bank_drop_sender, _bank_drop_receiver) = unbounded(); let (drop_bank_sender, _drop_bank_receiver) = unbounded();
ReplayStage::handle_new_root( ReplayStage::handle_new_root(
root, root,
&bank_forks, &bank_forks,
@ -3537,7 +3537,7 @@ pub mod tests {
&mut true, &mut true,
&mut Vec::new(), &mut Vec::new(),
&mut EpochSlotsFrozenSlots::default(), &mut EpochSlotsFrozenSlots::default(),
&bank_drop_sender, &drop_bank_sender,
); );
assert_eq!(bank_forks.read().unwrap().root(), root); assert_eq!(bank_forks.read().unwrap().root(), root);
assert!(bank_forks.read().unwrap().get(confirmed_root).is_some()); assert!(bank_forks.read().unwrap().get(confirmed_root).is_some());