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

Simplify root slot lookup from BankForks (#32717) 

No need to get an Arc<Bank> when we want the root slot from BankForks;
can just use BankForks::root().
This commit is contained in:
steviez 2023-08-04 12:03:22 -06:00 committed by GitHub
parent 04e25ff3ce
commit 226d7d986b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/validator.rs
View File

@ -1859,7 +1859,7 @@ impl<'a> ProcessBlockStore<'a> {
if let Some(hard_fork_restart_slot) = maybe_cluster_restart_with_hard_fork(
self.config,
self.bank_forks.read().unwrap().root_bank().slot(),
self.bank_forks.read().unwrap().root(),
) {
// reconciliation attempt 2 of 2 with hard fork
// this should be #2 because hard fork root > tower root in almost all cases

4
rpc/src/optimistically_confirmed_bank_tracker.rs
View File

@ -188,7 +188,7 @@ impl OptimisticallyConfirmedBankTracker {
SlotNotification::OptimisticallyConfirmed(bank.slot()),
);
}
} else if bank.slot() > bank_forks.read().unwrap().root_bank().slot() {
} else if bank.slot() > bank_forks.read().unwrap().root() {
pending_optimistically_confirmed_banks.insert(bank.slot());
debug!("notify_or_defer defer notifying for slot {:?}", bank.slot());
}
@ -287,7 +287,7 @@ impl OptimisticallyConfirmedBankTracker {
*highest_confirmed_slot = slot;
}
drop(w_optimistically_confirmed_bank);
} else if slot > bank_forks.read().unwrap().root_bank().slot() {
} else if slot > bank_forks.read().unwrap().root() {
pending_optimistically_confirmed_banks.insert(slot);
} else {
inc_new_counter_info!("dropped-already-rooted-optimistic-bank-notification", 1);