Use consistent variable naming for DropBankService
This commit is contained in:
parent
d44f3d7216
commit
dbc62f2e28
|
@ -1734,7 +1734,7 @@ impl ReplayStage {
|
|||
replay_timing: &mut ReplayTiming,
|
||||
voting_sender: &Sender<VoteOp>,
|
||||
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>,
|
||||
) {
|
||||
if bank.is_empty() {
|
||||
|
@ -1786,7 +1786,7 @@ impl ReplayStage {
|
|||
has_new_vote_been_rooted,
|
||||
vote_signatures,
|
||||
epoch_slots_frozen_slots,
|
||||
bank_drop_sender,
|
||||
drop_bank_sender,
|
||||
);
|
||||
rpc_subscriptions.notify_roots(rooted_slots);
|
||||
if let Some(sender) = bank_notification_sender {
|
||||
|
@ -2924,14 +2924,14 @@ impl ReplayStage {
|
|||
has_new_vote_been_rooted: &mut bool,
|
||||
voted_signatures: &mut Vec<Signature>,
|
||||
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(
|
||||
new_root,
|
||||
accounts_background_request_sender,
|
||||
highest_confirmed_root,
|
||||
);
|
||||
bank_drop_sender
|
||||
drop_bank_sender
|
||||
.send(removed_banks)
|
||||
.unwrap_or_else(|err| warn!("bank drop failed: {:?}", err));
|
||||
|
||||
|
@ -3442,7 +3442,7 @@ pub mod tests {
|
|||
.into_iter()
|
||||
.map(|slot| (slot, Hash::default()))
|
||||
.collect();
|
||||
let (bank_drop_sender, _bank_drop_receiver) = unbounded();
|
||||
let (drop_bank_sender, _drop_bank_receiver) = unbounded();
|
||||
ReplayStage::handle_new_root(
|
||||
root,
|
||||
&bank_forks,
|
||||
|
@ -3456,7 +3456,7 @@ pub mod tests {
|
|||
&mut true,
|
||||
&mut Vec::new(),
|
||||
&mut epoch_slots_frozen_slots,
|
||||
&bank_drop_sender,
|
||||
&drop_bank_sender,
|
||||
);
|
||||
assert_eq!(bank_forks.read().unwrap().root(), root);
|
||||
assert_eq!(progress.len(), 1);
|
||||
|
@ -3523,7 +3523,7 @@ pub mod tests {
|
|||
for i in 0..=root {
|
||||
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(
|
||||
root,
|
||||
&bank_forks,
|
||||
|
@ -3537,7 +3537,7 @@ pub mod tests {
|
|||
&mut true,
|
||||
&mut Vec::new(),
|
||||
&mut EpochSlotsFrozenSlots::default(),
|
||||
&bank_drop_sender,
|
||||
&drop_bank_sender,
|
||||
);
|
||||
assert_eq!(bank_forks.read().unwrap().root(), root);
|
||||
assert!(bank_forks.read().unwrap().get(confirmed_root).is_some());
|
||||
|
|
Loading…
Reference in New Issue