blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor new bank paths into common function (#8454)

This commit is contained in:
sakridge 2020-02-25 15:49:59 -08:00 committed by GitHub
parent 6ce4a1a18d
commit 1caeea8bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core/src/replay_stage.rs
View File

@ -534,13 +534,17 @@ impl ReplayStage {
"new fork:{} parent:{} (leader) root:{}", "new fork:{} parent:{} (leader) root:{}",
poh_slot, parent_slot, root_slot poh_slot, parent_slot, root_slot
); );
subscriptions.notify_slot(poh_slot, parent_slot, root_slot);
let tpu_bank = bank_forks
.write()
.unwrap()
.insert(Bank::new_from_parent(&parent, my_pubkey, poh_slot));
Self::record_rewards(&tpu_bank, &rewards_recorder_sender); let tpu_bank = Self::new_bank_from_parent_with_notify(
&parent,
poh_slot,
root_slot,
my_pubkey,
&rewards_recorder_sender,
subscriptions,
);
let tpu_bank = bank_forks.write().unwrap().insert(tpu_bank);
poh_recorder.lock().unwrap().set_bank(&tpu_bank); poh_recorder.lock().unwrap().set_bank(&tpu_bank);
} else { } else {
error!("{} No next leader found", my_pubkey); error!("{} No next leader found", my_pubkey);
@ -1019,10 +1023,14 @@ impl ReplayStage {
parent_slot, parent_slot,
forks.root() forks.root()
); );
subscriptions.notify_slot(child_slot, parent_slot, forks.root()); let child_bank = Self::new_bank_from_parent_with_notify(
&parent_bank,
let child_bank = Bank::new_from_parent(&parent_bank, &leader, child_slot); child_slot,
Self::record_rewards(&child_bank, &rewards_recorder_sender); forks.root(),
&leader,
&rewards_recorder_sender,
subscriptions,
);
new_banks.insert(child_slot, child_bank); new_banks.insert(child_slot, child_bank);
} }
} }
@ -1034,6 +1042,21 @@ impl ReplayStage {
} }
} }
fn new_bank_from_parent_with_notify(
parent: &Arc<Bank>,
slot: u64,
root_slot: u64,
leader: &Pubkey,
rewards_recorder_sender: &Option<RewardsRecorderSender>,
subscriptions: &Arc<RpcSubscriptions>,
) -> Bank {
subscriptions.notify_slot(slot, parent.slot(), root_slot);
let child_bank = Bank::new_from_parent(parent, leader, slot);
Self::record_rewards(&child_bank, &rewards_recorder_sender);
child_bank
}
fn record_rewards(bank: &Bank, rewards_recorder_sender: &Option<RewardsRecorderSender>) { fn record_rewards(bank: &Bank, rewards_recorder_sender: &Option<RewardsRecorderSender>) {
if let Some(rewards_recorder_sender) = rewards_recorder_sender { if let Some(rewards_recorder_sender) = rewards_recorder_sender {
if let Some(ref rewards) = bank.rewards { if let Some(ref rewards) = bank.rewards {